diff --git a/src/bare.lsp.in b/src/bare.lsp.in index 444adc88d..ff85596ac 100644 --- a/src/bare.lsp.in +++ b/src/bare.lsp.in @@ -149,3 +149,4 @@ ;;; Now we are in shape to do something useful. ;;; End of bare.lsp") (terpri) +(setf c::*compiler-break-enable* t) diff --git a/src/new-cmp/cmpcffi.lsp b/src/new-cmp/cmpcffi.lsp index b9e2abd18..b562b1bc5 100644 --- a/src/new-cmp/cmpcffi.lsp +++ b/src/new-cmp/cmpcffi.lsp @@ -57,9 +57,9 @@ ;; Find out the output types of the inline form. The syntax is rather relaxed ;; output-type = lisp-type | c-type | (values {lisp-type | c-type}*) (flet ((produce-type-pair (type) - (if (lisp-type-p type) - (cons type (lisp-type->rep-type type)) - (cons (rep-type->lisp-type type) type)))) + (if (c-backend::lisp-type-p type) + (cons type (c-backend::lisp-type->rep-type type)) + (cons (c-backend::rep-type->lisp-type type) type)))) (cond ((eq output-type ':void) (setf output-rep-type '() output-type 'NIL)) diff --git a/src/new-cmp/cmpenv.lsp b/src/new-cmp/cmpenv.lsp index 046bc4005..680f6d1a1 100644 --- a/src/new-cmp/cmpenv.lsp +++ b/src/new-cmp/cmpenv.lsp @@ -208,7 +208,7 @@ (proclaim-var decl-name (cdr decl))) (otherwise (cond ((multiple-value-bind (ok type) - (valid-type-specifier decl-name) + (c-types:valid-type-specifier decl-name) (when ok (proclaim-var type (rest decl)) t))) @@ -300,7 +300,7 @@ (push decl others)) (otherwise (multiple-value-bind (ok type) - (valid-type-specifier decl-name) + (c-types:valid-type-specifier decl-name) (cmpassert ok "The declaration specifier ~s is unknown." decl-name) (declare-variables type decl-args))) ))))) @@ -449,7 +449,7 @@ env) (defun cmp-env-declare-special (name &optional (env *cmp-env*)) - (cmp-env-register-var (c1make-global-variable name :warn nil :kind 'SPECIAL) + (cmp-env-register-var (c::c1make-global-variable name :warn nil :kind 'SPECIAL) env nil) env) diff --git a/src/new-cmp/cmploc.lsp b/src/new-cmp/cmploc.lsp index 8724e620d..27c615438 100644 --- a/src/new-cmp/cmploc.lsp +++ b/src/new-cmp/cmploc.lsp @@ -80,8 +80,8 @@ (LONG-FLOAT-VALUE 'LONG-FLOAT) (C-INLINE (let ((type (first (second loc)))) (cond ((and (consp type) (eq (first type) 'VALUES)) T) - ((lisp-type-p type) type) - (t (rep-type->lisp-type type))))) + ((c-backend::lisp-type-p type) type) + (t (c-backend::rep-type->lisp-type type))))) (BIND (var-type (second loc))) (LCL (or (third loc) T)) (MAKE-CCLOSURE 'FUNCTION) diff --git a/src/new-cmp/cmppackage.lsp b/src/new-cmp/cmppackage.lsp index 3711b877b..cd1db7ee7 100644 --- a/src/new-cmp/cmppackage.lsp +++ b/src/new-cmp/cmppackage.lsp @@ -39,6 +39,7 @@ "ELIMINATE-FROM-SET-NODES" "ELIMINATE-FROM-READ-NODES" "GLOBAL-VAR-P" "UNUSED-VARIABLE-P" "TEMPORAL-VAR-P" "FUNCTION-MAY-HAVE-SIDE-EFFECTS" + "FUNCTION-CLOSURE-VARIABLES" "FUN-VOLATILE-P" "FUN-NARG-P" "FUN-FIXED-NARG" "PPRINT-C1FORM" "PPRINT-C1FORMS" @@ -78,6 +79,8 @@ "DATA-PERMANENT-STORAGE-SIZE" "DATA-TEMPORARY-STORAGE-SIZE" "DATA-SIZE" "DATA-GET-ALL-OBJECTS" "DATA-INIT" "ADD-OBJECT" "ADD-SYMBOL" "ADD-KEYWORDS" + + "*COMPILER-CONSTANTS*" ) (:import-from "SI" "*COMPILER-CONSTANTS*")) @@ -130,7 +133,7 @@ "ADD-DECLARATIONS" "CMP-ENV-REGISTER-VAR" "CMP-ENV-DECLARE-SPECIAL" "CMP-ENV-ADD-DECLARATION" "CMP-ENV-EXTEND-DECLARATION" - "CMP-ENV-REGISTER-FUNCTOIN" "CMP-ENV-REGISTER-MACRO" + "CMP-ENV-REGISTER-FUNCTION" "CMP-ENV-REGISTER-MACRO" "CMP-ENV-REGISTER-FTYPE" "CMP-ENV-REGISTER-SYMBOL-MACRO" "CMP-ENV-REGISTER-BLOCK" "CMP-ENV-REGISTER-TAG" "CMP-ENV-REGISTER-CLEANUP" "CMP-ENV-CLEANUPS" @@ -176,6 +179,8 @@ "TYPE-OR" "TYPE>=" "TYPE-FILTER" + "VALID-TYPE-SPECIFIER" + "KNOWN-TYPE-P" "VALUES-TYPE-PRIMARY-TYPE" "VALUES-TYPE-TO-N-TYPES" "DEFAULT-INIT" diff --git a/src/new-cmp/cmptables.lsp b/src/new-cmp/cmptables.lsp index 4ad54154d..ec1abb46d 100644 --- a/src/new-cmp/cmptables.lsp +++ b/src/new-cmp/cmptables.lsp @@ -75,8 +75,8 @@ (progn . c1progn) ;; cmpffi.lsp - (ffi:clines . c-backend::c1clines) - (ffi:c-inline . c-backend::c1c-inline) + (ffi:clines . c1clines) + (ffi:c-inline . c1c-inline) ;; cmpflet (flet . c1flet)