diff options
Diffstat (limited to 'asmrun/stack.h')
| -rw-r--r-- | asmrun/stack.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/asmrun/stack.h b/asmrun/stack.h index dd7069099..a28711983 100644 --- a/asmrun/stack.h +++ b/asmrun/stack.h @@ -20,38 +20,38 @@ /* Macros to access the stack frame */ #ifdef TARGET_alpha -#define Saved_return_address(sp) *((long *)((sp) - 8)) +#define Saved_return_address(sp) *((intnat *)((sp) - 8)) #define Already_scanned(sp, retaddr) ((retaddr) & 1L) -#define Mark_scanned(sp, retaddr) (*((long *)((sp) - 8)) = (retaddr) | 1L) +#define Mark_scanned(sp, retaddr) (*((intnat *)((sp) - 8)) = (retaddr) | 1L) #define Mask_already_scanned(retaddr) ((retaddr) & ~1L) #define Callback_link(sp) ((struct caml_context *)((sp) + 16)) #endif #ifdef TARGET_sparc -#define Saved_return_address(sp) *((long *)((sp) + 92)) +#define Saved_return_address(sp) *((intnat *)((sp) + 92)) #define Callback_link(sp) ((struct caml_context *)((sp) + 104)) #endif #ifdef TARGET_i386 -#define Saved_return_address(sp) *((long *)((sp) - 4)) +#define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 8)) #endif #ifdef TARGET_mips -#define Saved_return_address(sp) *((long *)((sp) - 4)) +#define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 16)) #endif #ifdef TARGET_hppa #define Stack_grows_upwards -#define Saved_return_address(sp) *((long *)(sp)) +#define Saved_return_address(sp) *((intnat *)(sp)) #define Callback_link(sp) ((struct caml_context *)((sp) - 24)) #endif #ifdef TARGET_power -#define Saved_return_address(sp) *((long *)((sp) - 4)) +#define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Already_scanned(sp, retaddr) ((retaddr) & 1) -#define Mark_scanned(sp, retaddr) (*((long *)((sp) - 4)) = (retaddr) | 1) +#define Mark_scanned(sp, retaddr) (*((intnat *)((sp) - 4)) = (retaddr) | 1) #define Mask_already_scanned(retaddr) ((retaddr) & ~1) #ifdef SYS_aix #define Trap_frame_size 32 @@ -62,25 +62,25 @@ #endif #ifdef TARGET_m68k -#define Saved_return_address(sp) *((long *)((sp) - 4)) +#define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 8)) #endif #ifdef TARGET_arm -#define Saved_return_address(sp) *((long *)((sp) - 4)) +#define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 8)) #endif #ifdef TARGET_ia64 -#define Saved_return_address(sp) *((long *)((sp) + 8)) +#define Saved_return_address(sp) *((intnat *)((sp) + 8)) #define Already_scanned(sp, retaddr) ((retaddr) & 1L) -#define Mark_scanned(sp, retaddr) (*((long *)((sp) + 8)) = (retaddr) | 1L) +#define Mark_scanned(sp, retaddr) (*((intnat *)((sp) + 8)) = (retaddr) | 1L) #define Mask_already_scanned(retaddr) ((retaddr) & ~1L) #define Callback_link(sp) ((struct caml_context *)((sp) + 32)) #endif #ifdef TARGET_amd64 -#define Saved_return_address(sp) *((long *)((sp) - 8)) +#define Saved_return_address(sp) *((intnat *)((sp) - 8)) #define Callback_link(sp) ((struct caml_context *)((sp) + 16)) #endif @@ -88,18 +88,18 @@ struct caml_context { char * bottom_of_stack; /* beginning of Caml stack chunk */ - unsigned long last_retaddr; /* last return address in Caml code */ + uintnat last_retaddr; /* last return address in Caml code */ value * gc_regs; /* pointer to register block */ }; /* Declaration of variables used in the asm code */ extern char * caml_bottom_of_stack; -extern unsigned long caml_last_return_address; +extern uintnat caml_last_return_address; extern value * caml_gc_regs; extern char * caml_exception_pointer; extern value caml_globals[]; -extern long caml_globals_inited; -extern long * caml_frametable[]; +extern intnat caml_globals_inited; +extern intnat * caml_frametable[]; #endif /* CAML_STACK_H */ |