Commit ca47e7f7 authored by johnvg@science.ru.nl's avatar johnvg@science.ru.nl

in graph_copy: don't use dINT label anymore on amd64, always use INT

parent c2374bb5
...@@ -3,16 +3,13 @@ ...@@ -3,16 +3,13 @@
#ifdef _WIN64 #ifdef _WIN64
# define Int __int64 # define Int __int64
# define INT_descriptor dINT
# define ARCH_64 1 # define ARCH_64 1
#else #else
# if defined (MACH_O64) || defined (LINUX64) # if defined (MACH_O64) || defined (LINUX64)
# define Int long long # define Int long long
# define INT_descriptor dINT
# define ARCH_64 1 # define ARCH_64 1
# else # else
# define Int int # define Int int
# define INT_descriptor INT
# define ARCH_64 0 # define ARCH_64 0
# endif # endif
# if !(defined (LINUX32) || defined (LINUX64)) # if !(defined (LINUX32) || defined (LINUX64))
...@@ -35,7 +32,7 @@ int is_using_desc_relative_to_array (void) ...@@ -35,7 +32,7 @@ int is_using_desc_relative_to_array (void)
#endif #endif
} }
extern void *INT_descriptor,*CHAR,*BOOL,*REAL,*__STRING__,*__ARRAY__; extern void *INT,*CHAR,*BOOL,*REAL,*__STRING__,*__ARRAY__;
/*inline*/ /*inline*/
static void copy (Int *dest_p,Int *source_p,Int n_words) static void copy (Int *dest_p,Int *source_p,Int n_words)
...@@ -102,7 +99,7 @@ Int *copy_graph_to_string (Int *node_p,void *begin_free_heap,void *end_free_heap ...@@ -102,7 +99,7 @@ Int *copy_graph_to_string (Int *node_p,void *begin_free_heap,void *end_free_heap
arity=((unsigned short *)desc)[-1]; arity=((unsigned short *)desc)[-1];
if (arity==0){ if (arity==0){
if (desc==(Int)&INT_descriptor+2 || desc==(Int)&CHAR+2 || desc==(Int)&BOOL+2 if (desc==(Int)&INT+2 || desc==(Int)&CHAR+2 || desc==(Int)&BOOL+2
#if ARCH_64 #if ARCH_64
|| desc==(Int)&REAL+2 || desc==(Int)&REAL+2
#endif #endif
...@@ -173,7 +170,7 @@ Int *copy_graph_to_string (Int *node_p,void *begin_free_heap,void *end_free_heap ...@@ -173,7 +170,7 @@ Int *copy_graph_to_string (Int *node_p,void *begin_free_heap,void *end_free_heap
while (--array_size>=0) while (--array_size>=0)
stack_p[array_size]=(Int*)node_p[array_size]; stack_p[array_size]=(Int*)node_p[array_size];
break; break;
} else if (elem_desc==(Int)&INT_descriptor+2 } else if (elem_desc==(Int)&INT+2
#if ARCH_64 #if ARCH_64
|| elem_desc==(Int)&REAL+2 || elem_desc==(Int)&REAL+2
#endif #endif
...@@ -554,7 +551,7 @@ void remove_forwarding_pointers_from_graph (Int *node_p,Int **stack_end) ...@@ -554,7 +551,7 @@ void remove_forwarding_pointers_from_graph (Int *node_p,Int **stack_end)
while (--array_size>=0) while (--array_size>=0)
stack_p[array_size]=(Int*)node_p[array_size]; stack_p[array_size]=(Int*)node_p[array_size];
break; break;
} else if (elem_desc==(Int)&INT_descriptor+2 || elem_desc==(Int)&REAL+2 || elem_desc==(Int)&BOOL+2){ } else if (elem_desc==(Int)&INT+2 || elem_desc==(Int)&REAL+2 || elem_desc==(Int)&BOOL+2){
break; break;
} else { } else {
Int n_field_pointers; Int n_field_pointers;
......
...@@ -3,16 +3,13 @@ ...@@ -3,16 +3,13 @@
#ifdef _WIN64 #ifdef _WIN64
# define Int __int64 # define Int __int64
# define INT_descriptor dINT
# define ARCH_64 1 # define ARCH_64 1
#else #else
# if defined (MACH_O64) || defined (LINUX64) # if defined (MACH_O64) || defined (LINUX64)
# define Int long long # define Int long long
# define INT_descriptor dINT
# define ARCH_64 1 # define ARCH_64 1
# else # else
# define Int int # define Int int
# define INT_descriptor INT
# define ARCH_64 0 # define ARCH_64 0
# endif # endif
# if !(defined (LINUX32) || defined (LINUX64)) # if !(defined (LINUX32) || defined (LINUX64))
...@@ -26,7 +23,7 @@ ...@@ -26,7 +23,7 @@
# define USE_DESC_RELATIVE_TO_ARRAY 1 # define USE_DESC_RELATIVE_TO_ARRAY 1
#endif #endif
extern void *INT_descriptor,*CHAR,*BOOL,*REAL,*__STRING__,*__ARRAY__; extern void *INT,*CHAR,*BOOL,*REAL,*__STRING__,*__ARRAY__;
extern Int small_integers[],static_characters[]; extern Int small_integers[],static_characters[];
/*inline*/ /*inline*/
...@@ -76,7 +73,7 @@ Int *copy_string_to_graph (Int *string_p,void *begin_free_heap,void *end_free_he ...@@ -76,7 +73,7 @@ Int *copy_string_to_graph (Int *string_p,void *begin_free_heap,void *end_free_he
arity=((unsigned short *)desc)[-1]; arity=((unsigned short *)desc)[-1];
if (arity==0){ if (arity==0){
if (desc==(Int)&INT_descriptor+2){ if (desc==(Int)&INT+2){
Int i; Int i;
i=string_p[1]; i=string_p[1];
...@@ -209,7 +206,7 @@ Int *copy_string_to_graph (Int *string_p,void *begin_free_heap,void *end_free_he ...@@ -209,7 +206,7 @@ Int *copy_string_to_graph (Int *string_p,void *begin_free_heap,void *end_free_he
heap_p+=array_size; heap_p+=array_size;
break; break;
} else if (elem_desc==(Int)&INT_descriptor+2 } else if (elem_desc==(Int)&INT+2
#if ARCH_64 #if ARCH_64
|| elem_desc==(Int)&REAL+2 || elem_desc==(Int)&REAL+2
#endif #endif
...@@ -721,7 +718,7 @@ void remove_forwarding_pointers_from_string (Int *string_p,Int *end_forwarding_p ...@@ -721,7 +718,7 @@ void remove_forwarding_pointers_from_string (Int *string_p,Int *end_forwarding_p
arity=((unsigned short *)desc)[-1]; arity=((unsigned short *)desc)[-1];
if (arity==0){ if (arity==0){
if (desc==(Int)&INT_descriptor+2 || desc==(Int)&CHAR+2 || desc==(Int)&BOOL+2 if (desc==(Int)&INT+2 || desc==(Int)&CHAR+2 || desc==(Int)&BOOL+2
#if ARCH_64 #if ARCH_64
|| desc==(Int)&REAL+2 || desc==(Int)&REAL+2
#endif #endif
...@@ -750,7 +747,7 @@ void remove_forwarding_pointers_from_string (Int *string_p,Int *end_forwarding_p ...@@ -750,7 +747,7 @@ void remove_forwarding_pointers_from_string (Int *string_p,Int *end_forwarding_p
string_p+=3; string_p+=3;
if (elem_desc==0){ if (elem_desc==0){
} else if (elem_desc==(Int)&INT_descriptor+2 } else if (elem_desc==(Int)&INT+2
#if ARCH_64 #if ARCH_64
|| elem_desc==(Int)&REAL+2 || elem_desc==(Int)&REAL+2
#endif #endif
......
...@@ -299,7 +299,7 @@ make_symbol_name :: !String !String !Int -> String; ...@@ -299,7 +299,7 @@ make_symbol_name :: !String !String !Int -> String;
make_symbol_name "_system" descriptor_name prefix make_symbol_name "_system" descriptor_name prefix
= case descriptor_name of { = case descriptor_name of {
"INT" "INT"
-> IF_INT_64_OR_32 "dINT" descriptor_name; -> descriptor_name;
"CHAR" "CHAR"
-> descriptor_name; -> descriptor_name;
"REAL" "REAL"
......
s/_dINT/dINT/ s/_INT/INT/
s/_CHAR/CHAR/ s/_CHAR/CHAR/
s/_BOOL/BOOL/ s/_BOOL/BOOL/
s/_REAL/REAL/ s/_REAL/REAL/
......
s/_dINT/dINT/ s/_INT/INT/
s/_CHAR/CHAR/ s/_CHAR/CHAR/
s/_BOOL/BOOL/ s/_BOOL/BOOL/
s/_REAL/REAL/ s/_REAL/REAL/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment