Support for exception throwing.
These changes start to add support for a long jump style of exception throw.
A Context is added to build up the registers that will be loaded by the long
jump from callee saves that are on the stack. Throws are reworked slightly to
give the PC for the frame of the method being looked at, rather than the return
PC (that previously led the trace's PC to be off by a frame). Callee save
support is added to the JNI compiler which then no longer needs to spill
incoming argument registers as it may reuse the callee saves.
Currently the code is lightly tested on ARM and doesn't support
restoring floating point callee save registers.
Also clean up some PIC TODOs.
Change-Id: I9bcef4ab3bf4a9de57d7a5123fb3bb1707ca8921
diff --git a/src/calling_convention_x86.h b/src/calling_convention_x86.h
index d8dda57..8230754 100644
--- a/src/calling_convention_x86.h
+++ b/src/calling_convention_x86.h
@@ -39,7 +39,16 @@
virtual size_t FrameSize();
virtual size_t ReturnPcOffset();
virtual size_t OutArgSize();
- virtual size_t SpillAreaSize();
+ virtual const std::vector<ManagedRegister>& CalleeSaveRegisters() const {
+ DCHECK(callee_save_regs_.empty());
+ return callee_save_regs_;
+ }
+ virtual uint32_t CoreSpillMask() const {
+ return 0;
+ }
+ virtual uint32_t FpSpillMask() const {
+ return 0;
+ }
virtual bool IsOutArgRegister(ManagedRegister reg);
virtual bool IsCurrentParamInRegister();
virtual bool IsCurrentParamOnStack();
@@ -50,6 +59,8 @@
virtual size_t NumberOfOutgoingStackArgs();
private:
+ static std::vector<ManagedRegister> callee_save_regs_;
+
DISALLOW_COPY_AND_ASSIGN(X86JniCallingConvention);
};