diff options
| author | 2017-06-08 19:47:07 -0700 | |
|---|---|---|
| committer | 2017-06-08 19:47:07 -0700 | |
| commit | f44b3a6d3a7087999e82b1188c162c7390a13f78 (patch) | |
| tree | 30a026fe2689af86ac01277352749fae97d407a1 | |
| parent | d632b8b8a031cda163c6f9a6b4e33a192f123a0b (diff) | |
ART: Fix mips build
Follow-up to commit 8228cdf4ad6322ec8133564aaa51f966d36c0f17.
Test: m
Change-Id: I91672b7f08f5af9faa0926bd57e38c4936d47ec2
| -rw-r--r-- | runtime/arch/mips/fault_handler_mips.cc | 3 | ||||
| -rw-r--r-- | runtime/arch/mips64/fault_handler_mips64.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/arch/mips/fault_handler_mips.cc b/runtime/arch/mips/fault_handler_mips.cc index 25e442c3e6..52a3df55d6 100644 --- a/runtime/arch/mips/fault_handler_mips.cc +++ b/runtime/arch/mips/fault_handler_mips.cc @@ -18,6 +18,7 @@ #include <sys/ucontext.h> #include "art_method.h" +#include "base/callee_save_type.h" #include "base/hex_dump.h" #include "base/logging.h" #include "base/macros.h" @@ -80,7 +81,7 @@ bool NullPointerHandler::Action(int sig ATTRIBUTE_UNUSED, siginfo_t* info, void* // Decrement $sp by the frame size of the kSaveEverything method and store // the fault address in the padding right after the ArtMethod*. - sc->sc_regs[mips::SP] -= mips::MipsCalleeSaveFrameSize(Runtime::kSaveEverything); + sc->sc_regs[mips::SP] -= mips::MipsCalleeSaveFrameSize(CalleeSaveType::kSaveEverything); uintptr_t* padding = reinterpret_cast<uintptr_t*>(sc->sc_regs[mips::SP]) + /* ArtMethod* */ 1; *padding = reinterpret_cast<uintptr_t>(info->si_addr); diff --git a/runtime/arch/mips64/fault_handler_mips64.cc b/runtime/arch/mips64/fault_handler_mips64.cc index 69d73b09c2..9d77ebcd22 100644 --- a/runtime/arch/mips64/fault_handler_mips64.cc +++ b/runtime/arch/mips64/fault_handler_mips64.cc @@ -19,6 +19,7 @@ #include <sys/ucontext.h> #include "art_method.h" +#include "base/callee_save_type.h" #include "base/hex_dump.h" #include "base/logging.h" #include "base/macros.h" @@ -82,7 +83,7 @@ bool NullPointerHandler::Action(int sig ATTRIBUTE_UNUSED, siginfo_t* info, void* // Decrement $sp by the frame size of the kSaveEverything method and store // the fault address in the padding right after the ArtMethod*. - sc->sc_regs[mips64::SP] -= mips64::Mips64CalleeSaveFrameSize(Runtime::kSaveEverything); + sc->sc_regs[mips64::SP] -= mips64::Mips64CalleeSaveFrameSize(CalleeSaveType::kSaveEverything); uintptr_t* padding = reinterpret_cast<uintptr_t*>(sc->sc_regs[mips64::SP]) + /* ArtMethod* */ 1; *padding = reinterpret_cast<uintptr_t>(info->si_addr); |