diff options
| -rw-r--r-- | erts/emulator/beam/jit/x86/instr_trace.cpp | 21 | ||||
| -rw-r--r-- | erts/emulator/test/jit_SUITE.erl | 12 |
2 files changed, 22 insertions, 11 deletions
diff --git a/erts/emulator/beam/jit/x86/instr_trace.cpp b/erts/emulator/beam/jit/x86/instr_trace.cpp index 359d0d8a6d..f6d7937f4e 100644 --- a/erts/emulator/beam/jit/x86/instr_trace.cpp +++ b/erts/emulator/beam/jit/x86/instr_trace.cpp @@ -109,10 +109,10 @@ void BeamGlobalAssembler::emit_generic_bp_local() { a.cmp(RET, imm(BeamOpCodeAddr(op_i_debug_breakpoint))); a.je(labels[debug_bp]); +#ifdef NATIVE_ERLANG_STACK /* Note that we don't restore our return addresses in the `debug_bp` case * above, since it tail calls the error handler and thus never returns to * module code or `call_nif_early`. */ -#ifdef NATIVE_ERLANG_STACK a.push(TMP_MEM1q); a.push(TMP_MEM2q); #endif @@ -127,6 +127,12 @@ void BeamGlobalAssembler::emit_generic_bp_local() { void BeamGlobalAssembler::emit_debug_bp() { Label error = a.newLabel(); +#ifndef NATIVE_ERLANG_STACK + /* We're never going to return to module code, so we have to discard the + * return addresses added by the breakpoint trampoline. */ + a.add(x86::rsp, imm(sizeof(ErtsCodePtr[2]))); +#endif + emit_assert_erlang_stack(); emit_enter_frame(); @@ -204,16 +210,19 @@ void BeamModuleAssembler::emit_i_call_trace_return() { } void BeamModuleAssembler::emit_i_return_to_trace() { - emit_enter_runtime<Update::eHeapAlloc>(); + /* Remove our stack frame so that `beam_jit_return_to_trace` can inspect + * the next one. + * + * (This doesn't do anything if the native stack is used.) */ + emit_deallocate(ArgWord(BEAM_RETURN_TO_TRACE_FRAME_SZ)); + + emit_enter_runtime<Update::eReductions | Update::eHeapAlloc>(); a.mov(ARG1, c_p); runtime_call<1>(beam_jit_return_to_trace); - emit_leave_runtime<Update::eHeapAlloc>(); + emit_leave_runtime<Update::eReductions | Update::eHeapAlloc>(); - /* Remove the zero-sized stack frame. (Will actually do nothing if - * the native stack is used.) */ - emit_deallocate(ArgWord(BEAM_RETURN_TO_TRACE_FRAME_SZ)); emit_return(); } diff --git a/erts/emulator/test/jit_SUITE.erl b/erts/emulator/test/jit_SUITE.erl index 8e54e277fa..efd44d31ed 100644 --- a/erts/emulator/test/jit_SUITE.erl +++ b/erts/emulator/test/jit_SUITE.erl @@ -207,11 +207,13 @@ jmsingle(Config) -> %% true/false option and fails with a non-boolean, that is, we %% parse the command line correctly. case os:type() of - {_, netbsd} -> - %% +JMsingle true does not work on NetBSD. - - %% The emulator will dump a core here, so we set the cwd - %% to a temporary directory that we delete when the test is done. + {_, BSD} when BSD =:= netbsd; + BSD =:= openbsd -> + %% +JMsingle true might not work on these platforms, and dump core + %% because the emulator cannot be started. + %% + %% Set the cwd to a temporary directory that we'll delete when the + %% test is done. {ok, Cwd} = file:get_cwd(), TestDir = filename:join(proplists:get_value(priv_dir, Config), "jmsingle"), |