Changeset 15596 for trunk/abcl/src/org/armedbear/lisp/jvm-class-file.lisp

Timestamp:

11/26/22 08:35:27 (6 months ago)

Author:

Mark Evenson

Message:

• Fixes the issue with the compile & loading of Fricas0 system (Github
  • Now the file compiler will always try to compile the form and it will only fallback to the interpreted form when the bytecode error is actually raised

File:

• trunk/abcl/src/org/armedbear/lisp/jvm-class-file.lisp (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/jvm-class-file.lisp

@@ -268 +268 @@
       (princ ret-string s))
     str)
-;;  (format nil "(~{~A~})~A" 
+;;  (format nil "(~{~A~})~A"
 ;;          (internal-field-ref return-type))
   )
@@ -804 +804 @@
   (let ((interface-refs nil))
     (dolist (interface (class-file-interfaces class))
-      (push 
+      (push
        (pool-add-class (class-file-constants class)
                        interface)
@@ -1276 +1276 @@
           (c labels)
         (code-bytes c)
-      (assert (< 0 (length c) 65536))
+      (unless (< 0 (length c) 65536)
+        (signal 'sys:compiler-bytecode-length-error))
       (setf (code-code code) c
             (code-labels code) labels)))
@@ -1735 +1736 @@
 - add code to the code attribute
 - finalize the code attribute contents (blocking it for further addition)
-- 
+-