aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-10-01 11:53:09 +0200
committerBjörn Gustavsson <[email protected]>2010-10-01 11:53:09 +0200
commitfa5f3dffb5f93645bf6a4d2af2b78084395f0875 (patch)
tree99b1b3b239dd43a572bd64dfb8e2da11ed1a2a42
parent132e46f29297ab3de25b33bd52ddbad078900276 (diff)
parent105cc37ee041873c201bf1d0673b0ee071842758 (diff)
downloadotp-fa5f3dffb5f93645bf6a4d2af2b78084395f0875.tar.gz
otp-fa5f3dffb5f93645bf6a4d2af2b78084395f0875.tar.bz2
otp-fa5f3dffb5f93645bf6a4d2af2b78084395f0875.zip
Merge branch 'bjorn/halfword-emulator' into dev
* bjorn/halfword-emulator: Fix a bug in the ERTS_BIF_PREP_TRAPx() macros ts_install: Identify the halfword emulator
-rw-r--r--erts/emulator/beam/bif.h3
-rw-r--r--lib/test_server/src/ts_install.erl8
2 files changed, 5 insertions, 6 deletions
diff --git a/erts/emulator/beam/bif.h b/erts/emulator/beam/bif.h
index 50f5f4fbd6..a84ee7bb23 100644
--- a/erts/emulator/beam/bif.h
+++ b/erts/emulator/beam/bif.h
@@ -135,7 +135,6 @@ do { \
(Proc)->arity = 1; \
(Proc)->def_arg_reg[0] = (Eterm) (A0); \
*((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address); \
- (Proc)->def_arg_reg[3] = (UWord) ((Trap)->address); \
(Proc)->freason = TRAP; \
(Ret) = THE_NON_VALUE; \
} while (0)
@@ -146,7 +145,6 @@ do { \
(Proc)->def_arg_reg[0] = (Eterm) (A0); \
(Proc)->def_arg_reg[1] = (Eterm) (A1); \
*((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address); \
- (Proc)->def_arg_reg[3] = (UWord) ((Trap)->address); \
(Proc)->freason = TRAP; \
(Ret) = THE_NON_VALUE; \
} while (0)
@@ -158,7 +156,6 @@ do { \
(Proc)->def_arg_reg[1] = (Eterm) (A1); \
(Proc)->def_arg_reg[2] = (Eterm) (A2); \
*((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address); \
- (Proc)->def_arg_reg[3] = (UWord) ((Trap)->address); \
(Proc)->freason = TRAP; \
(Ret) = THE_NON_VALUE; \
} while (0)
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index bbbb7883db..2ddffccf5b 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -226,9 +226,11 @@ to_upper(String) ->
String).
word_size() ->
- case erlang:system_info(wordsize) of
- 4 -> "";
- 8 -> "/64"
+ case {erlang:system_info({wordsize,external}),
+ erlang:system_info({wordsize,internal})} of
+ {4,4} -> "";
+ {8,8} -> "/64";
+ {8,4} -> "/Halfword"
end.
linux_dist() ->