aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-02-11 10:15:53 +0100
committerBjörn Gustavsson <[email protected]>2010-03-10 14:25:27 +0100
commit3ddf0126dfcb60f0554e2d52187fa012f378e428 (patch)
tree34ddd16f0190dcfeda1a7ec57bcc9afa4e667187 /erts/doc
parentc591f7b2a78b44ab321d0b99c100b349c8606c15 (diff)
downloadotp-3ddf0126dfcb60f0554e2d52187fa012f378e428.tar.gz
otp-3ddf0126dfcb60f0554e2d52187fa012f378e428.tar.bz2
otp-3ddf0126dfcb60f0554e2d52187fa012f378e428.zip
Teach {wordsize,internal|external} to system_info/1
Some test suites need to differentiate between 32-bit terms and 32-bit pointers. While at it, remove some more warnings in process.c for SMP and debug.
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erlang.xml20
1 files changed, 17 insertions, 3 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 46f8df4683..0128855def 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -5850,9 +5850,23 @@ true</pre>
</item>
<tag><c>wordsize</c></tag>
<item>
- <p>Returns the word size in bytes as an integer, i.e. on a
- 32-bit architecture 4 is returned, and on a 64-bit
- architecture 8 is returned.</p>
+ <p>Same as <c>{wordsize, internal}</c></p>
+ </item>
+ <tag><c>{wordsize, internal}</c></tag>
+ <item>
+ <p>Returns the size of Erlang term words in bytes as an
+ integer, i.e. on a 32-bit architecture 4 is returned,
+ and on a pure 64-bit architecture 8 is returned. On a
+ halfword 64-bit emulator, 4 is returned, as the Erlang
+ terms are stored using a virtual wordsize of half the
+ systems wordsize.</p>
+ </item>
+ <tag><c>{wordsize, external}</c></tag>
+ <item>
+ <p>Returns the true wordsize of the emulator, i.e. the size
+ of a pointer, in bytes as an integer. On a pure 32-bit
+ architecture 4 is returned, on both a halfword and pure
+ 64-bit architecture, 8 is returned.</p>
</item>
</taglist>
<note>