diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-06-17 09:49:21 +0000 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2014-06-17 09:49:21 +0000 |
| commit | 8ebd94ab2e0d9867a7d384f00fa4cab24235216f (patch) | |
| tree | 5fc48d8179f6ec6942ebada59bc88c4626608410 /runtime/stack.h | |
| parent | aa9b3aee1e06f922e4518713f9b3dff00a0b2597 (diff) | |
| download | art-8ebd94ab2e0d9867a7d384f00fa4cab24235216f.zip art-8ebd94ab2e0d9867a7d384f00fa4cab24235216f.tar.gz art-8ebd94ab2e0d9867a7d384f00fa4cab24235216f.tar.bz2 | |
Revert "Fix access to FP registers when visiting stack"
This reverts commit aa9b3aee1e06f922e4518713f9b3dff00a0b2597.
Change-Id: Ied27deb89cca5ec9094d391374e03f83fcb76c33
Diffstat (limited to 'runtime/stack.h')
| -rw-r--r-- | runtime/stack.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/runtime/stack.h b/runtime/stack.h index 9402cdd..1991115 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -561,21 +561,15 @@ class StackVisitor { bool GetNextMethodAndDexPc(mirror::ArtMethod** next_method, uint32_t* next_dex_pc) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - bool GetVReg(mirror::ArtMethod* m, uint16_t vreg, VRegKind kind, uint32_t* val) const - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - uint32_t GetVReg(mirror::ArtMethod* m, uint16_t vreg, VRegKind kind) const - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - uint32_t val; - bool success = GetVReg(m, vreg, kind, &val); - CHECK(success) << "Failed to read vreg " << vreg << " of kind " << kind; - return val; - } + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - bool SetVReg(mirror::ArtMethod* m, uint16_t vreg, uint32_t new_value, VRegKind kind) + void SetVReg(mirror::ArtMethod* m, uint16_t vreg, uint32_t new_value, VRegKind kind) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); uintptr_t* GetGPRAddress(uint32_t reg) const; + uintptr_t GetGPR(uint32_t reg) const; + void SetGPR(uint32_t reg, uintptr_t value); // This is a fast-path for getting/setting values in a quick frame. uint32_t* GetVRegAddr(StackReference<mirror::ArtMethod>* cur_quick_frame, @@ -706,11 +700,6 @@ class StackVisitor { StackVisitor(Thread* thread, Context* context, size_t num_frames) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - bool GetGPR(uint32_t reg, uintptr_t* val) const; - bool SetGPR(uint32_t reg, uintptr_t value); - bool GetFPR(uint32_t reg, uintptr_t* val) const; - bool SetFPR(uint32_t reg, uintptr_t value); - instrumentation::InstrumentationStackFrame& GetInstrumentationStackFrame(uint32_t depth) const; void SanityCheckFrame() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |