Changeset 7318 for branches

Timestamp:

Sep 28, 2007, 4:35:03 PM (17 years ago)

Author:

Gary Byers

Message:

Elf-symbol/profiling changes. Work-in-progress.

Location:

branches/working-0709/ccl

Files:

• compiler/X86/x86-arch.lisp (modified) (1 diff)
• level-0/l0-misc.lisp (modified) (3 diffs)
• level-1/l1-boot-2.lisp (modified) (1 diff)
• lib/compile-ccl.lisp (modified) (1 diff)
• lib/macros.lisp (modified) (1 diff)
• lib/systems.lisp (modified) (1 diff)
• library/elf.lisp (added)

branches/working-0709/ccl/compiler/X86/x86-arch.lisp

@@ -40 +40 @@
     area-lock                           ; serialize access to gc
     exception-lock                      ; serialize exception handling
-    deleted-static-pairs                ; hash-consing
+    static-conses                       ; when FREEZE is in effect
     default-allocation-quantum          ; log2_heap_segment_size, as a fixnum.
     intflag                             ; interrupt-pending flag

branches/working-0709/ccl/level-0/l0-misc.lisp

@@ -129 +129 @@
   t)
 
-(defun frozen-space-size ()
+(defun frozen-space-dnodes ()
   "Returns the current size of the frozen area."
   (%fixnum-ref-natural (%get-kernel-global 'tenured-area)
@@ -150 +150 @@
                 (incf library bytes)
                 (incf static bytes))))))
-      (let* ((hons-size (ash (openmcl-hons:hons-space-size) target::dnode-shift)))
-        (decf dynamic hons-size)
-        (values dynamic static library hons-size))))
+      (let* ((frozen-size (ash (frozen-space-dnodes) target::dnode-shift)))
+        (decf dynamic frozen-size)
+        (values dynamic static library frozen-size))))
 
 
@@ -836 +836 @@
          (declare (fixnum state))
          (cond ((> state 0)
-                (unless (eql (%get-object ptr target::tcr.writer) tcr)
+                (unless (eql (%get-object ptr target::rwlock.writer) tcr)
                   (setf (%get-natural ptr target::rwlock.spin) 0)
                   (error :not-lock-owner :lock lock)))

branches/working-0709/ccl/level-1/l1-boot-2.lisp

@@ -269 +269 @@
       (bin-load-provide "MCL-COMPAT" "mcl-compat")
       (require "LOOP")
-      (require "HASH-CONS")
       (bin-load-provide "CCL-EXPORT-SYMS" "ccl-export-syms")
       (l1-load-provide "VERSION" "version")

branches/working-0709/ccl/lib/compile-ccl.lisp

@@ -193 +193 @@
         arglist
         edit-callers
-        hash-cons
         describe
         asdf

branches/working-0709/ccl/lib/macros.lisp

@@ -2951 +2951 @@
         (setf (,accessor ,dst ,i) (,accessor ,src ,i))))))
 
-      
+(defmacro assert-pointer-type (pointer type)
+  "Assert that the pointer points to an instance of the specified foreign type.
+Return the pointer."
+  (let* ((ptr (gensym)))
+    `(let* ((,ptr ,pointer))
+      (%set-macptr-type ,ptr (foreign-type-ordinal (load-time-value (parse-foreign-type ',type))))
+      ,ptr)))
+
     
 

branches/working-0709/ccl/lib/systems.lisp

@@ -181 +181 @@
 
     (edit-callers          "ccl:bin;edit-callers"   ("ccl:lib;edit-callers.lisp"))
-    (hash-cons        "ccl:library;hash-cons"    ("ccl:library;hash-cons.lisp"))
-; (step             "ccl:bin;step"           ("ccl:lib;step.lisp"))
+    ;; (hash-cons        "ccl:library;hash-cons"    ("ccl:library;hash-cons.lisp"))
+    ;; (step             "ccl:bin;step"           ("ccl:lib;step.lisp"))
     (ccl-export-syms  "ccl:bin;ccl-export-syms"  ("ccl:lib;ccl-export-syms.lisp"))
     (systems          "ccl:bin;systems"        ("ccl:lib;systems.lisp"))