From 1c86a620d74f4f9383c4956dafd3e2486300dc0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 17 Jun 2015 17:33:29 +0200
Subject: erts: Remove HALFWORD_HEAP definition

---
 erts/emulator/beam/copy.c | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'erts/emulator/beam/copy.c')

diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c
index 8849dadd00..94048f4c59 100644
--- a/erts/emulator/beam/copy.c
+++ b/erts/emulator/beam/copy.c
@@ -69,11 +69,7 @@ copy_object(Eterm obj, Process* to)
  * Return the "flat" size of the object.
  */
 
-#if HALFWORD_HEAP
-Uint size_object_rel(Eterm obj, Eterm* base)
-#else
 Uint size_object(Eterm obj)
-#endif
 {
     Uint sum = 0;
     Eterm* ptr;
@@ -227,12 +223,7 @@ Uint size_object(Eterm obj)
 /*
  *  Copy a structure to a heap.
  */
-#if HALFWORD_HEAP
-Eterm copy_struct_rel(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap,
-                      Eterm* src_base, Eterm* dst_base)
-#else
 Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
-#endif
 {
     char* hstart;
     Uint hsize;
@@ -287,13 +278,10 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 	    break;
 	case TAG_PRIMARY_LIST:
 	    objp = list_val_rel(obj,src_base);
-	#if !HALFWORD_HEAP || defined(DEBUG)
 	    if (in_area(objp,hstart,hsize)) {
-		ASSERT(!HALFWORD_HEAP);
 		hp++;
 		break;
 	    }
-	#endif
 	    argp = hp++;
 	    /* Fall through */
 
@@ -309,17 +297,9 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		}
 		else {
 		    CAR(htop) = elem;
-		#if HALFWORD_HEAP
-		    CDR(htop) = CDR(objp);
-		    *tailp = make_list_rel(htop,dst_base);
-		    htop += 2;
-		    goto L_copy;
-		#else
 		    tailp = &CDR(htop);
 		    htop += 2;
-		#endif
 		}
-		ASSERT(!HALFWORD_HEAP || tp < hp || tp >= hbot);
 		*tp = make_list_rel(tailp - 1, dst_base);
 		obj = CDR(objp);
 		if (!is_list(obj)) {
@@ -337,13 +317,10 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 	    }
 	    
 	case TAG_PRIMARY_BOXED:
-	#if !HALFWORD_HEAP || defined(DEBUG)
 	    if (in_area(boxed_val_rel(obj,src_base),hstart,hsize)) {
-		ASSERT(!HALFWORD_HEAP);
 		hp++;
 		break;
 	    }
-	#endif
 	    argp = hp++;
 
 	L_copy_boxed:
@@ -563,21 +540,12 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
  *
  * NOTE: Assumes that term is a tuple (ptr is an untagged tuple ptr).
  */
-#if HALFWORD_HEAP
-Eterm copy_shallow_rel(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap,
-		       Eterm* src_base)
-#else
 Eterm copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
-#endif
 {
     Eterm* tp = ptr;
     Eterm* hp = *hpp;
     const Eterm res = make_tuple(hp);
-#if HALFWORD_HEAP
-    const Sint offs = COMPRESS_POINTER(hp - (tp - src_base));
-#else
     const Sint offs = (hp - tp) * sizeof(Eterm);
-#endif
 
     while (sz--) {
 	Eterm val = *tp++;
-- 
cgit v1.2.3