From f26a13885e3816fa830f54f0aec79dabe453770e Mon Sep 17 00:00:00 2001 From: Juan Jose Garcia Ripoll Date: Sat, 3 Dec 2011 22:43:48 +0100 Subject: [PATCH] Removed unused location types and replaced CAR/CDR uses with C inline functions in src/cmp --- src/cmp/cmploc.lsp | 9 --------- src/cmp/cmptables.lsp | 3 --- src/cmp/cmptop.lsp | 2 +- src/cmp/sysfun.lsp | 18 +++++++++--------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/cmp/cmploc.lsp b/src/cmp/cmploc.lsp index f2fb62db7..072d77767 100644 --- a/src/cmp/cmploc.lsp +++ b/src/cmp/cmploc.lsp @@ -33,9 +33,6 @@ ;;; ( CALL-INDIRECT fun narg args) similar as CALL, but unknown function ;;; ( C-INLINE output-type fun/string locs side-effects output-var ) ;;; ( COERCE-LOC representation-type location) -;;; ( CAR lcl ) -;;; ( CDR lcl ) -;;; ( CADR lcl ) ;;; ( FDEFINITION vv-index ) ;;; ( MAKE-CCLOSURE cfun ) ;;; ( FIXNUM-VALUE fixnum-value ) @@ -151,12 +148,6 @@ '(RETURN RETURN-FIXNUM RETURN-CHARACTER RETURN-SINGLE-FLOAT RETURN-DOUBLE-FLOAT RETURN-LONG-FLOAT RETURN-OBJECT))) -(defun wt-car (loc) (wt "CAR(" loc ")")) - -(defun wt-cdr (loc) (wt "CDR(" loc ")")) - -(defun wt-cadr (loc) (wt "CADR(" loc ")")) - (defun lcl-name (lcl) (format nil "V~D" lcl)) (defun wt-lcl (lcl) (unless (numberp lcl) (baboon)) (wt "V" lcl)) diff --git a/src/cmp/cmptables.lsp b/src/cmp/cmptables.lsp index 9cd95b2ae..3785b4213 100644 --- a/src/cmp/cmptables.lsp +++ b/src/cmp/cmptables.lsp @@ -110,9 +110,6 @@ (temp . wt-temp) (lcl . wt-lcl-loc) - (car . wt-car) - (cdr . wt-cdr) - (cadr . wt-cadr) (fixnum-value . wt-number) (long-float-value . wt-number) (double-float-value . wt-number) diff --git a/src/cmp/cmptop.lsp b/src/cmp/cmptop.lsp index a295a077d..2ba566503 100644 --- a/src/cmp/cmptop.lsp +++ b/src/cmp/cmptop.lsp @@ -736,7 +736,7 @@ (wt-nl "CLV" n) (if first (progn (wt "=env0;") (setf first nil)) - (wt "=CDR(CLV" (1+ n) ");")) + (wt "=_ecl_cdr(CLV" (1+ n) ");")) (when (= n (var-loc (first bs))) (wt-comment (var-name (first clv-used))) (pop clv-used))) diff --git a/src/cmp/sysfun.lsp b/src/cmp/sysfun.lsp index 70cea16d5..93c213ce2 100644 --- a/src/cmp/sysfun.lsp +++ b/src/cmp/sysfun.lsp @@ -275,15 +275,15 @@ ;; file list.d (def-inline car :unsafe (cons) t "ECL_CONS_CAR(#0)") -(def-inline car :unsafe (t) t "CAR(#0)") +(def-inline car :unsafe (t) t "_ecl_car(#0)") -(def-inline si::cons-car :always (t) t "CAR(#0)") +(def-inline si::cons-car :always (t) t "_ecl_car(#0)") (def-inline si::cons-car :unsafe (t) t "ECL_CONS_CAR(#0)") (def-inline cdr :unsafe (cons) t "ECL_CONS_CDR(#0)") -(def-inline cdr :unsafe (t) t "CDR(#0)") +(def-inline cdr :unsafe (t) t "_ecl_cdr(#0)") -(def-inline si::cons-cdr :always (t) t "CDR(#0)") +(def-inline si::cons-cdr :always (t) t "_ecl_cdr(#0)") (def-inline si::cons-cdr :unsafe (t) t "ECL_CONS_CDR(#0)") ;; BEGIN-GENERATED (gen-cons-sysfun) @@ -366,14 +366,14 @@ (def-inline fourth :always (t) t "ecl_cadddr(#0)") (def-inline first :unsafe (cons) t "ECL_CONS_CAR(#0)") -(def-inline first :unsafe (t) t "CAR(#0)") -(def-inline second :unsafe (t) t "CADR(#0)") -(def-inline third :unsafe (t) t "CADDR(#0)") -(def-inline fourth :unsafe (t) t "CADDDR(#0)") +(def-inline first :unsafe (t) t "_ecl_car(#0)") +(def-inline second :unsafe (t) t "_ecl_cadr(#0)") +(def-inline third :unsafe (t) t "_ecl_caddr(#0)") +(def-inline fourth :unsafe (t) t "_ecl_cadddr(#0)") (def-inline rest :always (t) t "ecl_cdr(#0)") (def-inline rest :unsafe (cons) t "ECL_CONS_CDR(#0)") -(def-inline rest :unsafe (t) t "CDR(#0)") +(def-inline rest :unsafe (t) t "_ecl_cdr(#0)") (def-inline nthcdr :always (t t) t "ecl_nthcdr(fixint(#0),#1)") (def-inline nthcdr :always (fixnum t) t "ecl_nthcdr(#0,#1)")