Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove inclusion of config.h from the files that generate domain state table.

master
KC Sivaramakrishnan 2019-06-26 11:23:22 +05:30
parent 2a0e607851
commit 8721dc4e89
8 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/amd64.S
View File

@ -112,9 +112,6 @@
#endif #endif
#define CAML_CONFIG_H_NO_TYPEDEFS
#include "../runtime/caml/config.h"
.set domain_curr_field, 0 .set domain_curr_field, 0
#define DOMAIN_STATE(c_type, name) \ #define DOMAIN_STATE(c_type, name) \
.equ domain_field_caml_##name, domain_curr_field ; \ .equ domain_field_caml_##name, domain_curr_field ; \
@ -539,15 +536,15 @@ FUNCTION(G(caml_c_call))
CFI_STARTPROC CFI_STARTPROC
LBL(caml_c_call): LBL(caml_c_call):
/* Record lowest stack address and return address */ /* Record lowest stack address and return address */
popq %r12; CFI_ADJUST(-8) popq Caml_state(last_return_address); CFI_ADJUST(-8)
movq %r12, Caml_state(last_return_address)
movq %rsp, Caml_state(bottom_of_stack) movq %rsp, Caml_state(bottom_of_stack)
/* equivalent to pushing last return address */
subq $8, %rsp; CFI_ADJUST(8)
#ifdef WITH_SPACETIME #ifdef WITH_SPACETIME
/* Record the trie node hole pointer that corresponds to /* Record the trie node hole pointer that corresponds to
[Caml_state->last_return_address] */ [Caml_state->last_return_address] */
STORE_VAR(%r13, caml_spacetime_trie_node_ptr) STORE_VAR(%r13, caml_spacetime_trie_node_ptr)
#endif #endif
subq $8, %rsp; CFI_ADJUST(8) /* equivalent to pushq %r12 */
/* Touch the stack to trigger a recoverable segfault /* Touch the stack to trigger a recoverable segfault
if insufficient space remains */ if insufficient space remains */
subq $(STACK_PROBE_SIZE), %rsp; CFI_ADJUST(STACK_PROBE_SIZE); subq $(STACK_PROBE_SIZE), %rsp; CFI_ADJUST(STACK_PROBE_SIZE);

3
runtime/arm.S
View File

@ -122,9 +122,6 @@ caml_hot__code_begin:
caml_hot__code_end: caml_hot__code_end:
#endif #endif
#define CAML_CONFIG_H_NO_TYPEDEFS
#include "../runtime/caml/config.h"
.set domain_curr_field, 0 .set domain_curr_field, 0
#define DOMAIN_STATE(c_type, name) \ #define DOMAIN_STATE(c_type, name) \
.equ domain_field_caml_##name, domain_curr_field ; \ .equ domain_field_caml_##name, domain_curr_field ; \

3
runtime/arm64.S
View File

@ -50,9 +50,6 @@
#define CFI_OFFSET(r,n) #define CFI_OFFSET(r,n)
#endif #endif
#define CAML_CONFIG_H_NO_TYPEDEFS
#include "../runtime/caml/config.h"
.set domain_curr_field, 0 .set domain_curr_field, 0
#define DOMAIN_STATE(c_type, name) \ #define DOMAIN_STATE(c_type, name) \
.equ domain_field_caml_##name, domain_curr_field ; \ .equ domain_field_caml_##name, domain_curr_field ; \

2
runtime/caml/domain_state.tbl
View File

@ -14,13 +14,13 @@
/* */ /* */
/**************************************************************************/ /**************************************************************************/
DOMAIN_STATE(value*, young_ptr)
DOMAIN_STATE(value*, young_limit) DOMAIN_STATE(value*, young_limit)
/* Minor heap limit. See minor_gc.c. */ /* Minor heap limit. See minor_gc.c. */
DOMAIN_STATE(char*, exception_pointer) DOMAIN_STATE(char*, exception_pointer)
/* Exception pointer that points into the current stack */ /* Exception pointer that points into the current stack */
DOMAIN_STATE(value*, young_ptr)
DOMAIN_STATE(void*, young_base) DOMAIN_STATE(void*, young_base)
DOMAIN_STATE(value*, young_start) DOMAIN_STATE(value*, young_start)
DOMAIN_STATE(value*, young_end) DOMAIN_STATE(value*, young_end)

3
runtime/i386.S
View File

@ -82,9 +82,6 @@
#define STACK_PROBE_SIZE 16384 #define STACK_PROBE_SIZE 16384
#endif #endif
#define CAML_CONFIG_H_NO_TYPEDEFS
#include "../runtime/caml/config.h"
.set domain_curr_field, 0 .set domain_curr_field, 0
#define DOMAIN_STATE(c_type, name) \ #define DOMAIN_STATE(c_type, name) \
.equ domain_field_caml_##name, domain_curr_field ; \ .equ domain_field_caml_##name, domain_curr_field ; \

3
runtime/power.S
View File

@ -142,9 +142,6 @@
ld reg, LSYMB(glob)@toc(2) ld reg, LSYMB(glob)@toc(2)
#endif #endif
#define CAML_CONFIG_H_NO_TYPEDEFS
#include "../runtime/caml/config.h"
.set domain_curr_field, 0 .set domain_curr_field, 0
#define DOMAIN_STATE(c_type, name) \ #define DOMAIN_STATE(c_type, name) \
.equ domain_field_caml_##name, domain_curr_field ; \ .equ domain_field_caml_##name, domain_curr_field ; \

3
runtime/s390x.S
View File

@ -25,9 +25,6 @@
larl reg, glob larl reg, glob
#endif #endif
#define CAML_CONFIG_H_NO_TYPEDEFS
#include "../runtime/caml/config.h"
.set domain_curr_field, 0 .set domain_curr_field, 0
#define DOMAIN_STATE(c_type, name) \ #define DOMAIN_STATE(c_type, name) \
.equ domain_field_caml_##name, domain_curr_field ; \ .equ domain_field_caml_##name, domain_curr_field ; \

3
utils/domainstate.ml.c
View File

@ -14,9 +14,6 @@
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#define CAML_CONFIG_H_NO_TYPEDEFS
#include "config.h"
type t = type t =
#define DOMAIN_STATE(type, name) | Domain_##name #define DOMAIN_STATE(type, name) | Domain_##name
#include "domain_state.tbl" #include "domain_state.tbl"