From 700e522dffae89feeeb430739f10c234c6f14703 Mon Sep 17 00:00:00 2001 From: Roy Frostig Date: Fri, 16 Jul 2010 12:23:46 -0700 Subject: More renaming of GEP offsets in abi/trans. This should settle it. Also, fix some overenthusiastic renaming in previous commit. --- src/boot/be/abi.ml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/boot/be') diff --git a/src/boot/be/abi.ml b/src/boot/be/abi.ml index 3de553f2..3f97f0dd 100644 --- a/src/boot/be/abi.ml +++ b/src/boot/be/abi.ml @@ -45,15 +45,20 @@ let stk_field_valgrind_id = 0 + 1;; let stk_field_limit = stk_field_valgrind_id + 1;; let stk_field_data = stk_field_limit + 1;; -let obj_elt_vtbl = 0;; -let obj_elt_body_box = 1;; +(* Both obj and fn are two-word "bindings": One word points to some + * static dispatch information (vtbl or thunk), and the other points to + * some bag of bound data (object-body or closure). *) +let binding_field_dispatch = 0;; +let binding_field_bound_data = 1;; + +let obj_field_vtbl = binding_field_dispatch;; +let obj_field_body_box = binding_field_bound_data;; let obj_body_elt_tydesc = 0;; let obj_body_elt_fields = 1;; -let fn_elt_thunk = 0;; -let fn_elt_closure = 1;; - +let fn_field_thunk = binding_field_dispatch;; +let fn_field_closure = binding_field_bound_data;; let closure_elt_rc = 0;; let closure_elt_target = 1;; let closure_elt_bound_args = 2;; -- cgit v1.2.3