Ignore:
Timestamp:
Nov 18, 2003, 8:25:45 AM (16 years ago)
Author:
gb
Message:

missed a few DEFENUM stragglers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/compiler/arch.lisp

    r80 r81  
    2323(defmacro define-storage-layout (name origin &rest cells)
    2424  `(progn
    25      (defenum (:start ,origin :step 4)
    26        ,@(mapcar #'(lambda (cell) (form-symbol name "." cell)) cells))
    27      (defconstant ,(form-symbol name ".SIZE") ,(* (length cells) 4))))
     25     (ccl::defenum (:start ,origin :step 4)
     26       ,@(mapcar #'(lambda (cell) (ccl::form-symbol name "." cell)) cells))
     27     (defconstant ,(ccl::form-symbol name ".SIZE") ,(* (length cells) 4))))
    2828 
    2929(defmacro define-lisp-object (name tagname &rest cells)
     
    3131
    3232(defmacro define-subtag (name tag subtag)
    33   `(defconstant ,(form-symbol "SUBTAG-" name) (logior ,tag (ash ,subtag ntagbits))))
     33  `(defconstant ,(ccl::form-symbol "SUBTAG-" name) (logior ,tag (ash ,subtag ntagbits))))
    3434
    3535
     
    4343  `(progn
    4444     (define-lisp-object ,name fulltag-misc header ,@non-header-cells)
    45      (defenum ()
    46        ,@(mapcar #'(lambda (cell) (form-symbol name "." cell "-CELL")) non-header-cells))
    47      (defconstant ,(form-symbol name ".ELEMENT-COUNT") ,(length non-header-cells))))
     45     (ccl::defenum ()
     46       ,@(mapcar #'(lambda (cell) (ccl::form-symbol name "." cell "-CELL")) non-header-cells))
     47     (defconstant ,(ccl::form-symbol name ".ELEMENT-COUNT") ,(length non-header-cells))))
    4848
    4949
     
    8181;; by its TAG.  (Some headers have FULLTAGS that are congruent modulo 4 with the
    8282;; TAGS of other objects, but lisp can't "see" headers.)
    83 (defenum ()
     83(ccl::defenum ()
    8484  tag-fixnum                            ; All fixnums, whether odd or even
    8585  tag-list                              ; Conses and NIL
     
    9494;; Things that walk memory (and the stack) have to be careful to look at the FULLTAG of each
    9595;; object that they see.
    96 (defenum ()
     96(ccl::defenum ()
    9797  fulltag-even-fixnum                   ; I suppose EVENP/ODDP might care; nothing else does.
    9898  fulltag-cons                          ; a real (non-null) cons.  Shares TAG with fulltag-nil.
     
    434434
    435435
    436 (defenum (:prefix "AREA-")
     436(ccl::defenum (:prefix "AREA-")
    437437  void                                  ; list header
    438438  cstack                                ; a control stack
     
    556556; The objects in question are generally fixnum-tagged; the entries in the
    557557; "kernel-imports" vector are 4 bytes apart.
    558 (defenum (:prefix "KERNEL-IMPORT-" :start 0 :step 4)
     558(ccl::defenum (:prefix "KERNEL-IMPORT-" :start 0 :step 4)
    559559  fd-setsize-bytes
    560560  do-fd-set
     
    644644;; These are now supposed to match (mod 64) the %type-error-typespecs%
    645645;; array that %err-disp looks at.
    646 (defenum (:start  error-type-error :prefix "ERROR-OBJECT-NOT-")
     646(ccl::defenum (:start  error-type-error :prefix "ERROR-OBJECT-NOT-")
    647647  array
    648648  bignum
     
    727727  (and name (position name ccl::%builtin-functions% :test #'eq)))
    728728
    729 (defenum ()
     729(ccl::defenum ()
    730730  storage-class-lisp                    ; General lisp objects
    731731  storage-class-imm                     ; Fixnums, chars, NIL: not relocatable
Note: See TracChangeset for help on using the changeset viewer.