aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.h
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-03-10 17:33:06 +0100
committerSverker Eriksson <[email protected]>2011-03-10 17:33:06 +0100
commitdf454656f37296a47834ba8b01ec54f3638addba (patch)
tree8af160767fa201081aa5f6d5f3209617078af180 /erts/emulator/beam/bif.h
parent82106ef01f26a1d1a862b7f57fc580cbe46428b2 (diff)
parent5cddff325916c16487c0be91019ab737b3cfae3d (diff)
downloadotp-df454656f37296a47834ba8b01ec54f3638addba.tar.gz
otp-df454656f37296a47834ba8b01ec54f3638addba.tar.bz2
otp-df454656f37296a47834ba8b01ec54f3638addba.zip
Merge branch 'pg/fix-hibernate-with-hipe' into dev
* pg/fix-hibernate-with-hipe: Update copyright years Fix NULL-free bug in hibernate on debug emulator Fix several bugs related to hibernate/3 and HiPE Conflicts: erts/emulator/test/hibernate_SUITE.erl OTP-9125
Diffstat (limited to 'erts/emulator/beam/bif.h')
-rw-r--r--erts/emulator/beam/bif.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/emulator/beam/bif.h b/erts/emulator/beam/bif.h
index a84ee7bb23..8faa09feb8 100644
--- a/erts/emulator/beam/bif.h
+++ b/erts/emulator/beam/bif.h
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -201,6 +201,12 @@ do { \
return THE_NON_VALUE; \
} while(0)
+#define BIF_TRAP_CODE_PTR_(p, Code_) do { \
+ *((UWord *) (UWord) ((p)->def_arg_reg + 3)) = (UWord) (Code_); \
+ (p)->freason = TRAP; \
+ return THE_NON_VALUE; \
+ } while(0)
+
extern Export bif_return_trap_export;
#ifdef DEBUG
#define ERTS_BIF_PREP_YIELD_RETURN_X(RET, P, VAL, DEBUG_VAL) \