Merge branch 'pan/otp_8332_halfword' into dev

* pan/otp_8332_halfword:
  Teach testcase in driver_suite the new prototype for driver_async
  wx: Correct usage of driver callbacks from wx thread
  Adopt the new (R13B04) Nif functionality to the halfword codebase
  Support monitoring and demonitoring from driver threads
  Fix further test-suite problems
  Correct the VM to work for more test suites
  Teach {wordsize,internal|external} to system_info/1
  Make tracing and distribution work
  Turn on instruction packing in the loader and virtual machine
  Add the BeamInstr data type for loaded BEAM code
  Fix the BEAM dissambler for the half-word emulator
  Store pointers to heap data in 32-bit words
  Add a custom mmap wrapper to force heaps into the lower address range
  Fit all heap data into the 32-bit address range

1 files changed, 30 insertions, 30 deletions

diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index 10b11661e6..f2b951bca6 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2002-2010. 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
  * compliance with the License. You should have received a copy of the
  * Erlang Public License along with this software. If not, it can be
  * retrieved online at http://www.erlang.org/.
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * %CopyrightEnd%
  */
 
@@ -27,8 +27,8 @@
 typedef struct Allctr_t_ Allctr_t;
 
 typedef struct {
-    Uint ycs;
-    Uint mmc;
+    UWord ycs;
+    UWord mmc;
 } AlcUInit_t;
 
 typedef struct {
@@ -38,22 +38,22 @@ typedef struct {
     int tspec;
     int tpref;
     int ramv;
-    Uint sbct;
-    Uint asbcst;
-    Uint rsbcst;
-    Uint rsbcmt;
-    Uint rmbcmt;
-    Uint mmbcs;
-    Uint mmsbc;
-    Uint mmmbc;
-    Uint lmbcs;
-    Uint smbcs;
-    Uint mbcgs;
+    UWord sbct;
+    UWord asbcst;
+    UWord rsbcst;
+    UWord rsbcmt;
+    UWord rmbcmt;
+    UWord mmbcs;
+    UWord mmsbc;
+    UWord mmmbc;
+    UWord lmbcs;
+    UWord smbcs;
+    UWord mbcgs;
 } AllctrInit_t;
 
 typedef struct {
-    Uint blocks;
-    Uint carriers;
+    UWord blocks;
+    UWord carriers;
 } AllctrSize_t;
 
 #ifndef SMALL_MEMORY
@@ -163,19 +163,19 @@ void    erts_alcu_current_size(Allctr_t *, AllctrSize_t *);
 #define CEILING(X, I)  ((((X) - 1)/(I) + 1)*(I))
 
 #undef  WORD_MASK
-#define INV_WORD_MASK	((Uint) (sizeof(Uint) - 1))
+#define INV_WORD_MASK	((UWord) (sizeof(UWord) - 1))
 #define WORD_MASK	(~INV_WORD_MASK)
 #define WORD_FLOOR(X)	((X) & WORD_MASK)
 #define WORD_CEILING(X)	WORD_FLOOR((X) + INV_WORD_MASK)
 
 #undef  UNIT_MASK
-#define INV_UNIT_MASK	((Uint) (sizeof(Unit_t) - 1))
+#define INV_UNIT_MASK	((UWord) (sizeof(Unit_t) - 1))
 #define UNIT_MASK	(~INV_UNIT_MASK)
 #define UNIT_FLOOR(X)	((X) & UNIT_MASK)
 #define UNIT_CEILING(X)	UNIT_FLOOR((X) + INV_UNIT_MASK)
 
 
-#define SZ_MASK			(~((Uint) 0) << 3)
+#define SZ_MASK			(~((UWord) 0) << 3)
 #define FLG_MASK		(~(SZ_MASK))
 
 
@@ -189,7 +189,7 @@ typedef union {char c[8]; long l; double d;} Unit_t;
 
 typedef struct Carrier_t_ Carrier_t;
 struct Carrier_t_ {
-    Uint chdr;
+    UWord chdr;
     Carrier_t *next;
     Carrier_t *prev;
 };
@@ -199,17 +199,17 @@ typedef struct {
     Carrier_t *last;
 } CarrierList_t;
 
-typedef Uint Block_t;
-typedef Uint FreeBlkFtr_t;
+typedef UWord Block_t;
+typedef UWord FreeBlkFtr_t;
 
 typedef struct {
-    Uint giga_no;
-    Uint no;
+    UWord giga_no;
+    UWord no;
 } CallCounter_t;
 
 typedef struct {
-    Uint		no;
-    Uint		size;
+    UWord		no;
+    UWord		size;
 } StatValues_t;
 
 typedef struct {