Changeset 8225


Ignore:
Timestamp:
Jan 19, 2008, 7:02:12 AM (12 years ago)
Author:
rme
Message:

Try to get unconfused about things tagged with fulltag-imm.

Location:
branches/ia32
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/ia32/compiler/X86/X8632/x8632-arch.lisp

    r8075 r8225  
    295295(define-imm-subtag dead-macptr 4)
    296296(define-imm-subtag xcode-vector 5)      ; for cross-development
    297 (define-imm-subtag unbound 6)
     297
     298;;; immediate subtags
     299(define-subtag unbound fulltag-imm 6)
    298300(defconstant unbound-marker subtag-unbound)
    299301(defconstant undefined unbound-marker)
    300 ;subtag 7
    301 ;subtag 8
    302 (define-imm-subtag character 9)
    303 (define-imm-subtag slot-unbound 10)
     302(define-subtag character fulltag-imm 9)
     303(define-subtag slot-unbound fulltag-imm 10)
    304304(defconstant slot-unbound-marker subtag-slot-unbound)
    305 (define-imm-subtag illegal 11)
     305(define-subtag illegal fulltag-imm 11)
    306306(defconstant illegal-marker subtag-illegal)
    307 
    308 (define-imm-subtag reserved-frame 29)
     307(define-subtag reserved-frame fulltag-imm 29)
    309308(defconstant reserved-frame-marker subtag-reserved-frame)
    310 
    311 (define-imm-subtag no-thread-local-binding 30)
     309(define-subtag no-thread-local-binding fulltag-imm 30)
    312310
    313311;;; This has two functions: it tells the link-inverting marker where
     
    320318;;; function, or gain 7 bytes of otherwise unused space for debugging
    321319;;; info.
    322 (define-imm-subtag function-boundary-marker 31)
     320;;; xxx -- comments above not right for x8632
     321(define-subtag function-boundary-marker fulltag-imm 31)
    323322(defconstant function-boundary-marker subtag-function-boundary-marker)
    324323(defconstant max-non-array-imm-subtag (logior (ash 19 ntagbits) fulltag-immheader))
  • branches/ia32/lisp-kernel/x86-constants32.h

    r8222 r8225  
    130130#define max_non_array_node_subtag ((19<<ntagbits)|fulltag_immheader)
    131131
    132 /* xxx confused about this */
    133 #define unbound SUBTAG(fulltag_imm, 6)
    134 #define undefined unbound
    135 #define unbound_marker unbound
     132#define subtag_unbound SUBTAG(fulltag_imm, 6)
     133#define unbound_marker subtag_unbound
     134#define undefined subtag_unbound
     135#define unbound subtag_unbound
    136136#define subtag_character SUBTAG(fulltag_imm, 9)
    137137#define slot_unbound SUBTAG(fulltag_imm, 10)
    138138#define slot_unbound_marker slot_unbound
    139 #define no_thread_local_binding_marker SUBTAG(fulltag_imm,30)
    140 
     139#define subtag_illegal SUBTAG(fulltag_imm,11)
     140#define illegal_marker subtag_illegal
     141#define subtag_reserved_frame  SUBTAG(fulltag_imm,29)
     142#define reserved_frame_marker subtag_reserved_frame
     143#define subtag_no_thread_local_binding SUBTAG(fulltag_imm,30)
     144#define no_thread_local_binding_marker subtag_no_thread_local_binding
     145#define subtag_function_boundary_marker SUBTAG(fulltag_imm,31)
     146#define function_boundary_marker subtag_function_boundary_marker
    141147
    142148typedef struct cons {
  • branches/ia32/lisp-kernel/x86-constants32.s

    r8068 r8225  
    149149define_imm_subtag(dead_macptr,4)
    150150define_imm_subtag(xcode_vector,5)
    151 define_imm_subtag(unbound,6)
     151
     152define_subtag(unbound,fulltag_imm,6)
    152153unbound_marker = subtag_unbound
    153154undefined = unbound_marker
    154 
    155 define_imm_subtag(character,9)
    156 define_imm_subtag(slot_unbound,10)
     155define_subtag(character,fulltag_imm,9)
     156define_subtag(slot_unbound,fulltag_imm,10)
    157157slot_unbound_marker = subtag_slot_unbound
    158 define_imm_subtag(illegal,11)
     158define_subtag(illegal,fulltag_imm,11)
    159159illegal = subtag_illegal
    160 
    161 define_imm_subtag(reserved_frame,29)
     160define_subtag(reserved_frame,fulltag_imm,29)
    162161reserved_frame_marker = subtag_reserved_frame
    163 define_imm_subtag(no_thread_local_binding,30)
     162define_subtag(no_thread_local_binding,fulltag_imm,30)
    164163no_thread_local_binding_marker = subtag_no_thread_local_binding
    165 define_imm_subtag(function_boundary_marker,31)
     164define_subtag(function_boundary_marker,fulltag_imm,31)
    166165function_boundary_marker = subtag_function_boundary_marker
    167166
Note: See TracChangeset for help on using the changeset viewer.