Save interpreter r_ip into the frame (to protect against div)

Author: matthew-mojira

src/engine/compiler/SinglePassCompiler.v3

@@ -374,7 +374,14 @@ class SinglePassCompiler(xenv: SpcExecEnv, masm: MacroAssembler, regAlloc: RegAl
 				masm.emit_mov_m_l(frame.inlined_instance_slot, 0);
 			}
 		} else {
-			masm.emit_addw_r_i(X86_64MasmRegs.INT_EXEC_ENV.ip, uleb_size(func.func_index));
+			// Advance IP past the fast-call opcode and spill it
+			def r_ip = X86_64MasmRegs.INT_EXEC_ENV.ip;
+			def ip_slot = X86_64MasmRegs.INT_EXEC_ENV.ip_slot;
+			masm.emit_addw_r_i(r_ip, uleb_size(func.func_index));
+			masm.emit_mov_m_r(ValueKind.REF, ip_slot, r_ip);
+			// XXX why do we have to spill? because div will clobber rax
+			// In a single pass, we don't know at this point if a div will be used
+			// add as a property picked up during validation?
 		}
 
 		// Compute VFP = VSP - sig.params.length * SLOT_SIZE
@@ -2782,7 +2789,8 @@ class SinglePassCompiler(xenv: SpcExecEnv, masm: MacroAssembler, regAlloc: RegAl
 		return !isInlined() || ctl_base_sp == 0;
 	}
 	def inlineDepth() -> int {
-		return state.frame_stack.top - 1;
+		// subtract extra 1 in the fastcall case
+		return if(fast, state.frame_stack.top - 2, state.frame_stack.top - 1);
 	}
 	def snapshotFrames() -> Array<SpcFrame> {
 		var frames = Array<SpcFrame>.new(state.frame_stack.top);

src/engine/x86-64/X86_64SinglePassCompiler.v3

@@ -85,7 +85,9 @@ class X86_64SinglePassCompiler extends SinglePassCompiler {
 		mmasm.trap_stubs = TRAPS_STUB;
 	}
 	def emitFastDispatch() {
-		mmasm.emit_int_dispatch(r_tmp0, r_tmp1, r_ip, r_dispatch, ip_ptr, 
+		// XXX Restore IP from the interpreter frame slot
+		asm.movq_r_m(r_ip, m_ip);
+		mmasm.emit_int_dispatch(r_tmp0, r_tmp1, r_ip, r_dispatch, ip_ptr,
 				if(ic != null, IcCodeRef.new(ic.header.fastDispatchTableOffset)), true, ic);
 	}
 	private def saveIVar(r: X86_64Gpr) {