diff options
-rw-r--r-- | libguile/tags.h | 76 | ||||
-rw-r--r-- | module/system/base/types.scm | 46 | ||||
-rw-r--r-- | module/system/vm/assembler.scm | 14 |
3 files changed, 68 insertions, 68 deletions
diff --git a/libguile/tags.h b/libguile/tags.h index 1c9dce4b9..cf40c3d4d 100644 --- a/libguile/tags.h +++ b/libguile/tags.h @@ -389,8 +389,8 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM; /* Definitions for tc7: */ -#define SCM_ITAG7(x) (127 & SCM_UNPACK (x)) -#define SCM_TYP7(x) (0x7f & SCM_CELL_TYPE (x)) +#define SCM_ITAG7(x) (0x7f & SCM_UNPACK (x)) +#define SCM_TYP7(x) (0x7f & SCM_CELL_TYPE (x)) #define SCM_HAS_HEAP_TYPE(x, type, tag) \ (SCM_NIMP (x) && type (x) == (tag)) #define SCM_HAS_TYP7(x, tag) (SCM_HAS_HEAP_TYPE (x, SCM_TYP7, tag)) @@ -398,49 +398,49 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM; /* If you change these numbers, change them also in (system vm assembler). */ -#define scm_tc7_symbol 5 -#define scm_tc7_variable 7 +#define scm_tc7_symbol 0x05 +#define scm_tc7_variable 0x07 /* couple */ -#define scm_tc7_vector 13 -#define scm_tc7_wvect 15 - -#define scm_tc7_string 21 -#define scm_tc7_number 23 -#define scm_tc7_stringbuf 39 -#define scm_tc7_bytevector 77 - -#define scm_tc7_pointer 31 -#define scm_tc7_hashtable 29 -#define scm_tc7_fluid 37 -#define scm_tc7_dynamic_state 45 - -#define scm_tc7_frame 47 -#define scm_tc7_keyword 53 -#define scm_tc7_unused_55 55 -#define scm_tc7_vm_cont 71 - -#define scm_tc7_unused_17 61 -#define scm_tc7_unused_21 63 -#define scm_tc7_program 69 -#define scm_tc7_unused_79 79 -#define scm_tc7_weak_set 85 -#define scm_tc7_weak_table 87 -#define scm_tc7_array 93 -#define scm_tc7_bitvector 95 -#define scm_tc7_unused_12 101 -#define scm_tc7_unused_18 103 -#define scm_tc7_unused_13 109 -#define scm_tc7_unused_14 111 -#define scm_tc7_unused_15 117 -#define scm_tc7_unused_16 119 -#define scm_tc7_port 125 +#define scm_tc7_vector 0x0d +#define scm_tc7_wvect 0x0f + +#define scm_tc7_string 0x15 +#define scm_tc7_number 0x17 +#define scm_tc7_stringbuf 0x27 +#define scm_tc7_bytevector 0x4d + +#define scm_tc7_pointer 0x1f +#define scm_tc7_hashtable 0x1d +#define scm_tc7_fluid 0x25 +#define scm_tc7_dynamic_state 0x2d + +#define scm_tc7_frame 0x2f +#define scm_tc7_keyword 0x35 +#define scm_tc7_unused_55 0x37 +#define scm_tc7_vm_cont 0x47 + +#define scm_tc7_unused_17 0x3d +#define scm_tc7_unused_21 0x3f +#define scm_tc7_program 0x45 +#define scm_tc7_unused_79 0x4f +#define scm_tc7_weak_set 0x55 +#define scm_tc7_weak_table 0x57 +#define scm_tc7_array 0x5d +#define scm_tc7_bitvector 0x5f +#define scm_tc7_unused_12 0x65 +#define scm_tc7_unused_18 0x67 +#define scm_tc7_unused_13 0x6d +#define scm_tc7_unused_14 0x6f +#define scm_tc7_unused_15 0x75 +#define scm_tc7_unused_16 0x77 +#define scm_tc7_port 0x7d /* There are 256 smob subtypes. [**] If you change scm_tc7_smob, you must * also change the places it is hard coded in this file and possibly others. * Dirk:FIXME:: Any hard coded reference to scm_tc7_smob must be replaced by a * symbolic reference. */ -#define scm_tc7_smob 127 /* DO NOT CHANGE [**] */ +#define scm_tc7_smob 0x7f /* DO NOT CHANGE [**] */ /* Definitions for tc16: */ diff --git a/module/system/base/types.scm b/module/system/base/types.scm index 0e7371baa..a96348872 100644 --- a/module/system/base/types.scm +++ b/module/system/base/types.scm @@ -243,29 +243,29 @@ the matching bits, possibly with bitwise operations to extract it from BITS." (define %tc8-flag (+ %tc3-imm24 0)) ;; Cell types. -(define %tc3-struct 1) -(define %tc7-symbol 5) -(define %tc7-variable 7) -(define %tc7-vector 13) -(define %tc7-wvect 15) -(define %tc7-string 21) -(define %tc7-number 23) -(define %tc7-hashtable 29) -(define %tc7-pointer 31) -(define %tc7-fluid 37) -(define %tc7-stringbuf 39) -(define %tc7-dynamic-state 45) -(define %tc7-frame 47) -(define %tc7-keyword 53) -(define %tc7-program 69) -(define %tc7-vm-continuation 71) -(define %tc7-bytevector 77) -(define %tc7-weak-set 85) -(define %tc7-weak-table 87) -(define %tc7-array 93) -(define %tc7-bitvector 95) -(define %tc7-port 125) -(define %tc7-smob 127) +(define %tc3-struct #x01) +(define %tc7-symbol #x05) +(define %tc7-variable #x07) +(define %tc7-vector #x0d) +(define %tc7-wvect #x0f) +(define %tc7-string #x15) +(define %tc7-number #x17) +(define %tc7-hashtable #x1d) +(define %tc7-pointer #x1f) +(define %tc7-fluid #x25) +(define %tc7-stringbuf #x27) +(define %tc7-dynamic-state #x2d) +(define %tc7-frame #x2f) +(define %tc7-keyword #x35) +(define %tc7-program #x45) +(define %tc7-vm-continuation #x47) +(define %tc7-bytevector #x4d) +(define %tc7-weak-set #x55) +(define %tc7-weak-table #x57) +(define %tc7-array #x5d) +(define %tc7-bitvector #x5f) +(define %tc7-port #x7d) +(define %tc7-smob #x7f) (define %tc16-bignum (+ %tc7-number (* 1 256))) (define %tc16-real (+ %tc7-number (* 2 256))) diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm index c9ef5f191..e07f7d4e8 100644 --- a/module/system/vm/assembler.scm +++ b/module/system/vm/assembler.scm @@ -1152,27 +1152,27 @@ returned instead." ;; ;; FIXME: Define all tc7 values in Scheme in one place, derived from ;; tags.h. -(define-tc7-macro-assembler br-if-symbol 5) -(define-tc7-macro-assembler br-if-variable 7) -(define-tc7-macro-assembler br-if-vector 13) +(define-tc7-macro-assembler br-if-symbol #x05) +(define-tc7-macro-assembler br-if-variable #x07) +(define-tc7-macro-assembler br-if-vector #x0d) ;(define-tc7-macro-assembler br-if-weak-vector 13) -(define-tc7-macro-assembler br-if-string 21) +(define-tc7-macro-assembler br-if-string #x15) ;(define-tc7-macro-assembler br-if-heap-number 23) ;(define-tc7-macro-assembler br-if-stringbuf 39) -(define-tc7-macro-assembler br-if-bytevector 77) +(define-tc7-macro-assembler br-if-bytevector #x4d) ;(define-tc7-macro-assembler br-if-pointer 31) ;(define-tc7-macro-assembler br-if-hashtable 29) ;(define-tc7-macro-assembler br-if-fluid 37) ;(define-tc7-macro-assembler br-if-dynamic-state 45) ;(define-tc7-macro-assembler br-if-frame 47) -(define-tc7-macro-assembler br-if-keyword 53) +(define-tc7-macro-assembler br-if-keyword #x35) ;(define-tc7-macro-assembler br-if-vm 55) ;(define-tc7-macro-assembler br-if-vm-cont 71) ;(define-tc7-macro-assembler br-if-rtl-program 69) ;(define-tc7-macro-assembler br-if-weak-set 85) ;(define-tc7-macro-assembler br-if-weak-table 87) ;(define-tc7-macro-assembler br-if-array 93) -(define-tc7-macro-assembler br-if-bitvector 95) +(define-tc7-macro-assembler br-if-bitvector #x5f) ;(define-tc7-macro-assembler br-if-port 125) ;(define-tc7-macro-assembler br-if-smob 127) |