diff options
| author | Sverker Eriksson <[email protected]> | 2014-05-20 18:35:21 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-05-20 18:35:29 +0200 |
| commit | 7d78f2563e4ef9f7f165b1ba06212c6f09167809 (patch) | |
| tree | 3927758f799cd787a74bc655f4903371971f2605 /erts/emulator/hipe/hipe_ppc_glue.S | |
| parent | 50556f5e37cd866ecba39be22d94c32e88d358cb (diff) | |
| parent | 0799ae534f61aef1a47d751d48a09c8b49995e7a (diff) | |
| download | otp-7d78f2563e4ef9f7f165b1ba06212c6f09167809.tar.gz otp-7d78f2563e4ef9f7f165b1ba06212c6f09167809.tar.bz2 otp-7d78f2563e4ef9f7f165b1ba06212c6f09167809.zip | |
Merge branch 'sverk/hipe-global-trace-bug'
OTP-11939
* sverk/hipe-global-trace-bug:
erts: Remove some dead hipe specific code
erts: Fix global tracing of beam function when called from hipe code
erts: Save some space in process struct for hipe
Diffstat (limited to 'erts/emulator/hipe/hipe_ppc_glue.S')
| -rw-r--r-- | erts/emulator/hipe/hipe_ppc_glue.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/hipe/hipe_ppc_glue.S b/erts/emulator/hipe/hipe_ppc_glue.S index 6f0217c738..0c337a14df 100644 --- a/erts/emulator/hipe/hipe_ppc_glue.S +++ b/erts/emulator/hipe/hipe_ppc_glue.S @@ -296,7 +296,7 @@ CSYM(hipe_ppc_throw_to_native): * which should look as follows: * * stub for f/N: - * <set r12 to f's BEAM code address> + * <set r12 to f's export entry address> * <set r0 to N> * b nbif_callemu * @@ -312,10 +312,10 @@ CSYM(hipe_ppc_throw_to_native): */ GLOBAL(ASYM(nbif_callemu)) ASYM(nbif_callemu): - STORE r12, P_BEAM_IP(P) + STORE r12, P_CALLEE_EXP(P) STORE r0, P_ARITY(P) STORE_ARG_REGS - li r3, HIPE_MODE_SWITCH_RES_CALL + li r3, HIPE_MODE_SWITCH_RES_CALL_EXPORTED b .suspend_exit /* |