From 3985141b73f789558c5417fc9d155e2ad211d405 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Thu, 20 Dec 2001 21:46:10 +0000 Subject: [PATCH] Eliminate MACRO special form. --- v7/src/compiler/back/lapgn3.scm | 9 +++-- v7/src/compiler/base/crsend.scm | 15 +++---- v7/src/compiler/base/lvalue.scm | 4 +- v7/src/compiler/base/scode.scm | 4 +- v7/src/compiler/base/utils.scm | 9 +++-- v7/src/compiler/fggen/canon.scm | 14 +++---- v7/src/compiler/fggen/fggen.scm | 8 ++-- v7/src/compiler/machines/C/lapgen.scm | 9 +++-- v7/src/compiler/machines/C/rules3.scm | 9 +++-- v7/src/compiler/machines/C/rulfix.scm | 13 +++--- v7/src/compiler/machines/C/rulflo.scm | 9 +++-- v7/src/compiler/machines/alpha/assmd.scm | 10 ++--- v7/src/compiler/machines/alpha/dassm1.scm | 11 ++--- v7/src/compiler/machines/alpha/dassm2.scm | 12 +++--- v7/src/compiler/machines/alpha/instr1.scm | 19 ++++----- v7/src/compiler/machines/alpha/instr2.scm | 13 +++--- v7/src/compiler/machines/alpha/instr3.scm | 13 +++--- v7/src/compiler/machines/alpha/lapgen.scm | 6 +-- v7/src/compiler/machines/alpha/rules3.scm | 4 +- v7/src/compiler/machines/alpha/rulflo.scm | 4 +- v7/src/compiler/machines/bobcat/assmd.scm | 9 +++-- v7/src/compiler/machines/bobcat/dassm1.scm | 4 +- v7/src/compiler/machines/bobcat/dassm2.scm | 15 +++---- v7/src/compiler/machines/bobcat/flinstr1.scm | 9 +++-- v7/src/compiler/machines/bobcat/flinstr2.scm | 9 +++-- v7/src/compiler/machines/bobcat/instr2.scm | 19 ++++----- v7/src/compiler/machines/bobcat/instr3.scm | 9 +++-- v7/src/compiler/machines/bobcat/instr4.scm | 11 ++--- v7/src/compiler/machines/bobcat/lapgen.scm | 17 ++++---- v7/src/compiler/machines/bobcat/machin.scm | 9 +++-- v7/src/compiler/machines/bobcat/rules3.scm | 13 +++--- v7/src/compiler/machines/i386/assmd.scm | 10 ++--- v7/src/compiler/machines/i386/dassm1.scm | 4 +- v7/src/compiler/machines/i386/dassm2.scm | 15 +++---- v7/src/compiler/machines/i386/dassm3.scm | 4 +- v7/src/compiler/machines/i386/instr1.scm | 18 ++++----- v7/src/compiler/machines/i386/instr2.scm | 14 +++---- v7/src/compiler/machines/i386/instrf.scm | 16 ++++---- v7/src/compiler/machines/i386/lapgen.scm | 6 +-- v7/src/compiler/machines/i386/rules3.scm | 12 +++--- v7/src/compiler/machines/i386/rulfix.scm | 9 +++-- v7/src/compiler/machines/i386/rulflo.scm | 11 ++--- v7/src/compiler/machines/mips/assmd.scm | 10 ++--- v7/src/compiler/machines/mips/dassm1.scm | 4 +- v7/src/compiler/machines/mips/dassm2.scm | 16 ++++---- v7/src/compiler/machines/mips/instr1.scm | 31 ++++++++------- v7/src/compiler/machines/mips/instr2a.scm | 9 +++-- v7/src/compiler/machines/mips/instr2b.scm | 9 +++-- v7/src/compiler/machines/mips/instr3.scm | 13 +++--- v7/src/compiler/machines/mips/lapgen.scm | 9 +++-- v7/src/compiler/machines/mips/mips.scm | 9 +++-- v7/src/compiler/machines/mips/rules3.scm | 9 +++-- v7/src/compiler/machines/mips/rulflo.scm | 11 ++--- v7/src/compiler/machines/sparc/assmd.scm | 10 ++--- v7/src/compiler/machines/sparc/instr1.scm | 13 +++--- v7/src/compiler/machines/sparc/instr2a.scm | 9 +++-- v7/src/compiler/machines/sparc/instr2b.scm | 9 +++-- v7/src/compiler/machines/sparc/instr3.scm | 13 +++--- v7/src/compiler/machines/sparc/lapgen.scm | 9 +++-- v7/src/compiler/machines/sparc/rules3.scm | 9 +++-- v7/src/compiler/machines/sparc/rulflo.scm | 11 ++--- v7/src/compiler/machines/spectrum/assmd.scm | 10 ++--- v7/src/compiler/machines/spectrum/dassm1.scm | 4 +- v7/src/compiler/machines/spectrum/dassm2.scm | 15 +++---- v7/src/compiler/machines/spectrum/instr1.scm | 9 +++-- v7/src/compiler/machines/spectrum/instr2.scm | 42 ++++++++++---------- v7/src/compiler/machines/spectrum/instr3.scm | 35 ++++++++-------- v7/src/compiler/machines/spectrum/lapgen.scm | 11 ++--- v7/src/compiler/machines/spectrum/rules3.scm | 13 +++--- v7/src/compiler/machines/spectrum/rulfix.scm | 13 +++--- v7/src/compiler/machines/spectrum/rulflo.scm | 13 +++--- v7/src/compiler/machines/vax/assmd.scm | 10 ++--- v7/src/compiler/machines/vax/dassm1.scm | 10 ++--- v7/src/compiler/machines/vax/dassm2.scm | 15 +++---- v7/src/compiler/machines/vax/instr2.scm | 6 +-- v7/src/compiler/machines/vax/instr3.scm | 14 +++---- v7/src/compiler/machines/vax/lapgen.scm | 11 ++--- v7/src/compiler/machines/vax/rules3.scm | 9 +++-- v7/src/compiler/machines/vax/rulfix.scm | 14 +++---- v7/src/compiler/rtlbase/rtlreg.scm | 9 +++-- 80 files changed, 482 insertions(+), 432 deletions(-) diff --git a/v7/src/compiler/back/lapgn3.scm b/v7/src/compiler/back/lapgn3.scm index ea6518c05..fa03cdd9a 100644 --- a/v7/src/compiler/back/lapgn3.scm +++ b/v7/src/compiler/back/lapgn3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: lapgn3.scm,v 4.12 1999/01/02 06:06:43 cph Exp $ +$Id: lapgn3.scm,v 4.13 2001/12/20 21:45:23 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generator @@ -70,7 +71,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. label))))) (let-syntax ((->label - (macro (find var #!optional suffix) + (lambda (find var #!optional suffix) `(object->label ,find (lambda () ,var) (lambda (new) diff --git a/v7/src/compiler/base/crsend.scm b/v7/src/compiler/base/crsend.scm index 139c4944f..7b659b0b8 100644 --- a/v7/src/compiler/base/crsend.scm +++ b/v7/src/compiler/base/crsend.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: crsend.scm,v 1.10 1999/01/02 06:06:43 cph Exp $ +$Id: crsend.scm,v 1.11 2001/12/20 21:45:23 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Cross Compiler End @@ -118,10 +119,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (with-absolutely-no-interrupts (lambda () (let-syntax ((ucode-primitive - (macro (name) + (lambda (name) (make-primitive-procedure name))) (ucode-type - (macro (name) + (lambda (name) (microcode-type name)))) ((ucode-primitive PRIMITIVE-OBJECT-SET-TYPE) (ucode-type COMPILED-ENTRY) @@ -143,10 +144,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define (cross-link/finish-assembly code-block objects scheme-object-width) (let-syntax ((ucode-primitive - (macro (name) + (lambda (name) (make-primitive-procedure name))) (ucode-type - (macro (name) + (lambda (name) (microcode-type name)))) (let* ((bl (quotient (bit-string-length code-block) scheme-object-width)) diff --git a/v7/src/compiler/base/lvalue.scm b/v7/src/compiler/base/lvalue.scm index 4f8a9e636..2ccbc8889 100644 --- a/v7/src/compiler/base/lvalue.scm +++ b/v7/src/compiler/base/lvalue.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: lvalue.scm,v 4.22 2001/10/22 19:10:20 cph Exp $ +$Id: lvalue.scm,v 4.23 2001/12/20 21:45:23 cph Exp $ Copyright (c) 1988-1990, 1999, 2001 Massachusetts Institute of Technology @@ -103,7 +103,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-named-variable - (macro (name) + (lambda (name) (let ((symbol (intern (string-append "#[" (symbol->string name) "]")))) `(BEGIN (DEFINE-INTEGRABLE (,(symbol-append 'MAKE- name '-VARIABLE) BLOCK) diff --git a/v7/src/compiler/base/scode.scm b/v7/src/compiler/base/scode.scm index 6da798f7a..5bbd6e7b1 100644 --- a/v7/src/compiler/base/scode.scm +++ b/v7/src/compiler/base/scode.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: scode.scm,v 4.11 2001/12/20 16:28:22 cph Exp $ +$Id: scode.scm,v 4.12 2001/12/20 21:45:23 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (declare (usual-integrations)) (let-syntax ((define-scode-operators - (macro names + (lambda names `(BEGIN ,@(map (lambda (name) `(DEFINE ,(symbol-append 'SCODE/ name) (ACCESS ,name SYSTEM-GLOBAL-ENVIRONMENT))) diff --git a/v7/src/compiler/base/utils.scm b/v7/src/compiler/base/utils.scm index 597a6b445..f0f3c28d7 100644 --- a/v7/src/compiler/base/utils.scm +++ b/v7/src/compiler/base/utils.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: utils.scm,v 4.21 2001/12/20 20:51:15 cph Exp $ +$Id: utils.scm,v 4.22 2001/12/20 21:45:23 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Compiler Utilities @@ -136,7 +137,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Type Codes (let-syntax ((define-type-code - (macro (var-name #!optional type-name) + (lambda (var-name #!optional type-name) (if (default-object? type-name) (set! type-name var-name)) `(DEFINE-INTEGRABLE ,(symbol-append 'TYPE-CODE: var-name) ',(microcode-type type-name))))) diff --git a/v7/src/compiler/fggen/canon.scm b/v7/src/compiler/fggen/canon.scm index cc7298493..854c50c6b 100644 --- a/v7/src/compiler/fggen/canon.scm +++ b/v7/src/compiler/fggen/canon.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: canon.scm,v 1.18 2001/12/20 18:04:49 cph Exp $ +$Id: canon.scm,v 1.19 2001/12/20 21:45:23 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -504,7 +504,7 @@ ARBITRARY: The expression may be executed more than once. It ;;;; Hairier expressions (let-syntax ((is-operator? - (macro (value name) + (lambda (value name) `(or (eq? ,value (ucode-primitive ,name)) (and (scode/absolute-reference? ,value) (eq? (scode/absolute-reference-name ,value) @@ -798,27 +798,27 @@ ARBITRARY: The expression may be executed more than once. It (let-syntax ((dispatch-entry - (macro (type handler) + (lambda (type handler) `(VECTOR-SET! DISPATCH-VECTOR ,(microcode-type type) ,handler))) (dispatch-entries - (macro (types handler) + (lambda (types handler) `(BEGIN ,@(map (lambda (type) `(DISPATCH-ENTRY ,type ,handler)) types)))) (standard-entry - (macro (name) + (lambda (name) `(DISPATCH-ENTRY ,name ,(symbol-append 'CANONICALIZE/ name)))) (nary-entry - (macro (nary name) + (lambda (nary name) `(DISPATCH-ENTRY ,name (,(symbol-append 'CANONICALIZE/ nary) ,(symbol-append 'SCODE/ name '-COMPONENTS) ,(symbol-append 'SCODE/MAKE- name))))) (binary-entry - (macro (name) + (lambda (name) `(NARY-ENTRY binary ,name)))) ;; quotations are treated as constants. diff --git a/v7/src/compiler/fggen/fggen.scm b/v7/src/compiler/fggen/fggen.scm index f7fbcd17d..2cc8d2347 100644 --- a/v7/src/compiler/fggen/fggen.scm +++ b/v7/src/compiler/fggen/fggen.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: fggen.scm,v 4.33 2001/12/20 16:28:22 cph Exp $ +$Id: fggen.scm,v 4.34 2001/12/20 21:45:23 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -955,15 +955,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((dispatch-entry - (macro (type handler) + (lambda (type handler) `(VECTOR-SET! DISPATCH-VECTOR ,(microcode-type type) ,handler))) (dispatch-entries - (macro (types handler) + (lambda (types handler) `(BEGIN ,@(map (lambda (type) `(DISPATCH-ENTRY ,type ,handler)) types)))) (standard-entry - (macro (name) + (lambda (name) `(DISPATCH-ENTRY ,name ,(symbol-append 'GENERATE/ name))))) (standard-entry access) (standard-entry assignment) diff --git a/v7/src/compiler/machines/C/lapgen.scm b/v7/src/compiler/machines/C/lapgen.scm index 2f746625c..e502984ac 100644 --- a/v7/src/compiler/machines/C/lapgen.scm +++ b/v7/src/compiler/machines/C/lapgen.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: lapgen.scm,v 1.12 1999/01/02 06:06:43 cph Exp $ +$Id: lapgen.scm,v 1.13 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; RTL Rules for C. Shared utilities. @@ -578,7 +579,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. operator)))) (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() diff --git a/v7/src/compiler/machines/C/rules3.scm b/v7/src/compiler/machines/C/rules3.scm index 46b59a916..e93da6c48 100644 --- a/v7/src/compiler/machines/C/rules3.scm +++ b/v7/src/compiler/machines/C/rules3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rules3.scm,v 1.9 1999/01/02 06:06:43 cph Exp $ +$Id: rules3.scm,v 1.10 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Invocations and Entries @@ -165,7 +166,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-special-primitive-invocation - (macro (name) + (lambda (name) `(DEFINE-RULE STATEMENT (INVOCATION:SPECIAL-PRIMITIVE (? FRAME-SIZE) diff --git a/v7/src/compiler/machines/C/rulfix.scm b/v7/src/compiler/machines/C/rulfix.scm index be9d44c9d..470565979 100644 --- a/v7/src/compiler/machines/C/rulfix.scm +++ b/v7/src/compiler/machines/C/rulfix.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rulfix.scm,v 1.3 1999/01/02 06:06:43 cph Exp $ +$Id: rulfix.scm,v 1.4 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Fixnum Rules @@ -164,7 +165,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((binary-fixnum - (macro (name instr) + (lambda (name instr) `(define-arithmetic-method ',name fixnum-methods/2-args (lambda (tgt src1 src2 overflow?) (if overflow? (no-overflow-branches!)) @@ -177,7 +178,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((binary-fixnum - (macro (name instr) + (lambda (name instr) `(define-arithmetic-method ',name fixnum-methods/2-args (lambda (tgt src1 src2 overflow?) (if overflow? (no-overflow-branches!)) @@ -409,7 +410,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((binary-fixnum - (macro (name instr) + (lambda (name instr) `(define-arithmetic-method ',name fixnum-methods/2-args/register*constant (lambda (tgt src1 constant overflow?) diff --git a/v7/src/compiler/machines/C/rulflo.scm b/v7/src/compiler/machines/C/rulflo.scm index 9c6f53f22..d45300126 100644 --- a/v7/src/compiler/machines/C/rulflo.scm +++ b/v7/src/compiler/machines/C/rulflo.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rulflo.scm,v 1.5 1999/01/02 06:06:43 cph Exp $ +$Id: rulflo.scm,v 1.6 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Flonum rules @@ -190,7 +191,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/2-args (lambda (target source1 source2) (LAP ,',target " = (" ,',source1 ,opcode ,',source2 diff --git a/v7/src/compiler/machines/alpha/assmd.scm b/v7/src/compiler/machines/alpha/assmd.scm index 1dac24906..8aa6f6a0d 100644 --- a/v7/src/compiler/machines/alpha/assmd.scm +++ b/v7/src/compiler/machines/alpha/assmd.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: assmd.scm,v 1.2 1999/01/02 06:48:57 cph Exp $ +$Id: assmd.scm,v 1.3 2001/12/20 21:46:10 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,8 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Assembler Machine Dependencies @@ -25,7 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (declare (usual-integrations)) -(let-syntax ((ucode-type (macro (name) `',(microcode-type name)))) +(let-syntax ((ucode-type (lambda (name) `',(microcode-type name)))) (define-integrable maximum-padding-length ;; Instruction length is always a multiple of 32 bits diff --git a/v7/src/compiler/machines/alpha/dassm1.scm b/v7/src/compiler/machines/alpha/dassm1.scm index 782d1bdca..30676ded0 100644 --- a/v7/src/compiler/machines/alpha/dassm1.scm +++ b/v7/src/compiler/machines/alpha/dassm1.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: dassm1.scm,v 1.2 1999/01/02 06:48:57 cph Exp $ +$Id: dassm1.scm,v 1.3 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,9 +16,10 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# + ;;;; Disassembler: User Level ;;; Package: (compiler disassembler) @@ -148,7 +149,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (cond ((not (< index end)) 'DONE) ((object-type? (let-syntax ((ucode-type - (macro (name) (microcode-type name)))) + (lambda (name) (microcode-type name)))) (ucode-type linkage-section)) (system-vector-ref block index)) (loop (disassembler/write-linkage-section block diff --git a/v7/src/compiler/machines/alpha/dassm2.scm b/v7/src/compiler/machines/alpha/dassm2.scm index c24216a4d..f6d960ed0 100644 --- a/v7/src/compiler/machines/alpha/dassm2.scm +++ b/v7/src/compiler/machines/alpha/dassm2.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: dassm2.scm,v 1.2 1999/01/02 06:48:57 cph Exp $ +$Id: dassm2.scm,v 1.3 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,8 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Alpha Disassembler: Top Level @@ -32,9 +32,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (set! disassembler/read-variable-cache (lambda (block index) (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type quad) diff --git a/v7/src/compiler/machines/alpha/instr1.scm b/v7/src/compiler/machines/alpha/instr1.scm index 3e755cc38..d2d62910a 100644 --- a/v7/src/compiler/machines/alpha/instr1.scm +++ b/v7/src/compiler/machines/alpha/instr1.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr1.scm,v 1.4 1999/01/02 06:48:57 cph Exp $ +$Id: instr1.scm,v 1.5 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# @@ -30,7 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((memory-format-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? destination) (OFFSET (? offset) (? base))) (VARIABLE-WIDTH (offset offset) @@ -91,7 +92,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((special-memory-instruction - (macro (keyword functioncode) + (lambda (keyword functioncode) `(define-instruction ,keyword (() (LONG (6 #x18) @@ -99,7 +100,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (5 #x0) (16 ,functioncode)))))) (special-memory-instruction-Ra - (macro (keyword functioncode) + (lambda (keyword functioncode) `(define-instruction ,keyword (((? Ra)) (LONG (6 #x18) @@ -107,7 +108,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (5 #x0) (16 ,functioncode)))))) (special-memory-instruction-Rb - (macro (keyword functioncode) + (lambda (keyword functioncode) `(define-instruction ,keyword (((? Rb)) (LONG (6 #x18) @@ -126,7 +127,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((operate-format - (macro (keyword opcode functioncode) + (lambda (keyword opcode functioncode) `(define-instruction ,keyword (((? source-1) (& (? constant)) (? destination)) (LONG (6 ,opcode) @@ -214,7 +215,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((pal-format - (macro (keyword functioncode) + (lambda (keyword functioncode) `(define-instruction ,keyword (() (LONG (6 0) diff --git a/v7/src/compiler/machines/alpha/instr2.scm b/v7/src/compiler/machines/alpha/instr2.scm index f346577aa..59db1a7a0 100644 --- a/v7/src/compiler/machines/alpha/instr2.scm +++ b/v7/src/compiler/machines/alpha/instr2.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr2.scm,v 1.2 1999/01/02 06:48:57 cph Exp $ +$Id: instr2.scm,v 1.3 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# @@ -29,7 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ; Unconditional jump instructions (let-syntax ((memory-branch - (macro (keyword hint) + (lambda (keyword hint) `(define-instruction ,keyword (((? link-register) (? base)) (LONG (6 #x1a) @@ -70,7 +71,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((branch - (macro (keyword opcode reverse-op) + (lambda (keyword opcode reverse-op) `(define-instruction ,keyword (((? reg) (@PCO (? offset))) (LONG (6 ,opcode) @@ -136,7 +137,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((unconditional-branch - (macro (keyword opcode hint) + (lambda (keyword opcode hint) `(define-instruction ,keyword (((? reg) (@PCO (? offset))) (LONG (6 ,opcode) diff --git a/v7/src/compiler/machines/alpha/instr3.scm b/v7/src/compiler/machines/alpha/instr3.scm index 1b36c4946..a3b8d22b9 100644 --- a/v7/src/compiler/machines/alpha/instr3.scm +++ b/v7/src/compiler/machines/alpha/instr3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr3.scm,v 1.2 1999/01/02 06:48:57 cph Exp $ +$Id: instr3.scm,v 1.3 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# @@ -43,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((floating-operate - (macro (keyword function-code) + (lambda (keyword function-code) `(define-instruction ,keyword (((? src-1) (? src-2) (? dest)) (LONG (6 #x17) ; Opcode @@ -69,7 +70,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((ieee - (macro (keyword function-code) + (lambda (keyword function-code) `(define-instruction ,keyword (((? src-1) (? src-2) (? dest)) (LONG (6 #x16) ; Opcode @@ -102,7 +103,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((vax - (macro (keyword function-code) + (lambda (keyword function-code) `(define-instruction ,keyword (((? src-1) (? src-2) (? dest)) (LONG (6 #x15) ; Opcode diff --git a/v7/src/compiler/machines/alpha/lapgen.scm b/v7/src/compiler/machines/alpha/lapgen.scm index 42b8fd976..bf18b80cf 100644 --- a/v7/src/compiler/machines/alpha/lapgen.scm +++ b/v7/src/compiler/machines/alpha/lapgen.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: lapgen.scm,v 1.7 2001/12/19 21:39:29 cph Exp $ +$Id: lapgen.scm,v 1.8 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology @@ -837,7 +837,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;;;; Codes and Hooks (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() @@ -859,7 +859,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA set! define lookup-apply)) (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names offset) (if (null? names) '() diff --git a/v7/src/compiler/machines/alpha/rules3.scm b/v7/src/compiler/machines/alpha/rules3.scm index 46f63fcf8..ffaae1d9f 100644 --- a/v7/src/compiler/machines/alpha/rules3.scm +++ b/v7/src/compiler/machines/alpha/rules3.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: rules3.scm,v 1.8 2001/12/19 21:39:30 cph Exp $ +$Id: rules3.scm,v 1.9 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology @@ -156,7 +156,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-special-primitive-invocation - (macro (name) + (lambda (name) `(DEFINE-RULE STATEMENT (INVOCATION:SPECIAL-PRIMITIVE (? FRAME-SIZE) diff --git a/v7/src/compiler/machines/alpha/rulflo.scm b/v7/src/compiler/machines/alpha/rulflo.scm index 0fed1c9fa..e1020d384 100644 --- a/v7/src/compiler/machines/alpha/rulflo.scm +++ b/v7/src/compiler/machines/alpha/rulflo.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: rulflo.scm,v 1.4 2001/12/19 21:39:30 cph Exp $ +$Id: rulflo.scm,v 1.5 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology @@ -199,7 +199,7 @@ the vector length header are the same size. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/2-args (lambda (target source1 source2) (LAP (,opcode ,',source1 ,',source2 ,',target))))))) diff --git a/v7/src/compiler/machines/bobcat/assmd.scm b/v7/src/compiler/machines/bobcat/assmd.scm index c38acddf5..ed393b9bc 100644 --- a/v7/src/compiler/machines/bobcat/assmd.scm +++ b/v7/src/compiler/machines/bobcat/assmd.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: assmd.scm,v 1.37 1999/01/02 06:06:43 cph Exp $ +$Id: assmd.scm,v 1.38 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1988, 1989, 1999 Massachusetts Institute of Technology +Copyright (c) 1988, 1989, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,14 +16,15 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Assembler Machine Dependencies (declare (usual-integrations)) -(let-syntax ((ucode-type (macro (name) `',(microcode-type name)))) +(let-syntax ((ucode-type (lambda (name) `',(microcode-type name)))) (define-integrable maximum-padding-length ;; Instruction length is always a multiple of 16 bits diff --git a/v7/src/compiler/machines/bobcat/dassm1.scm b/v7/src/compiler/machines/bobcat/dassm1.scm index 5241325cb..a6c191f08 100644 --- a/v7/src/compiler/machines/bobcat/dassm1.scm +++ b/v7/src/compiler/machines/bobcat/dassm1.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: dassm1.scm,v 4.20 2001/08/10 17:28:55 cph Exp $ +$Id: dassm1.scm,v 4.21 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -135,7 +135,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (cond ((not (< index end)) 'DONE) ((object-type? (let-syntax ((ucode-type - (macro (name) (microcode-type name)))) + (lambda (name) (microcode-type name)))) (ucode-type linkage-section)) (system-vector-ref block index)) (loop (disassembler/write-linkage-section block diff --git a/v7/src/compiler/machines/bobcat/dassm2.scm b/v7/src/compiler/machines/bobcat/dassm2.scm index 5d5233b6c..c2a18890d 100644 --- a/v7/src/compiler/machines/bobcat/dassm2.scm +++ b/v7/src/compiler/machines/bobcat/dassm2.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: dassm2.scm,v 4.23 1999/01/02 06:06:43 cph Exp $ +$Id: dassm2.scm,v 4.24 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; 68000 Disassembler: Top Level @@ -26,9 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define (disassembler/read-variable-cache block index) (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type quad) @@ -153,9 +154,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (with-absolutely-no-interrupts (lambda () (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type compiled-entry) diff --git a/v7/src/compiler/machines/bobcat/flinstr1.scm b/v7/src/compiler/machines/bobcat/flinstr1.scm index 8c6a84527..ca64a2afd 100644 --- a/v7/src/compiler/machines/bobcat/flinstr1.scm +++ b/v7/src/compiler/machines/bobcat/flinstr1.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: flinstr1.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: flinstr1.scm,v 1.3 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1988, 1989, 1999 Massachusetts Institute of Technology +Copyright (c) 1988, 1989, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Instruction set description for 68881 floating point processor @@ -137,7 +138,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-unary-flop - (macro (name bits) + (lambda (name bits) `(define-instruction ,name (((? type float-source-format) diff --git a/v7/src/compiler/machines/bobcat/flinstr2.scm b/v7/src/compiler/machines/bobcat/flinstr2.scm index d761ef211..2f0471a30 100644 --- a/v7/src/compiler/machines/bobcat/flinstr2.scm +++ b/v7/src/compiler/machines/bobcat/flinstr2.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: flinstr2.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: flinstr2.scm,v 1.3 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1988, 1989, 1999 Massachusetts Institute of Technology +Copyright (c) 1988, 1989, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Instruction set description for 68881 floating point processor @@ -26,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-binary-flop - (macro (name bits) + (lambda (name bits) `(define-instruction ,name (((? type float-source-format) diff --git a/v7/src/compiler/machines/bobcat/instr2.scm b/v7/src/compiler/machines/bobcat/instr2.scm index af63322fd..847d13457 100644 --- a/v7/src/compiler/machines/bobcat/instr2.scm +++ b/v7/src/compiler/machines/bobcat/instr2.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr2.scm,v 1.19 1999/01/02 06:06:43 cph Exp $ +$Id: instr2.scm,v 1.20 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; 68000 Instruction Set Description @@ -42,7 +43,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; BCD Arithmetic (let-syntax ((define-BCD-addition - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((D (? ry)) (D (? rx))) (WORD (4 ,opcode) @@ -66,7 +67,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Binary Arithmetic (let-syntax ((define-binary-addition - (macro (keyword Qkeyword Xkeyword opcode Qbit Iopcode) + (lambda (keyword Qkeyword Xkeyword opcode Qbit Iopcode) `(BEGIN (define-instruction ,Qkeyword ;ADDQ/SUBQ ((B (& (? data)) (? ea ea-all-A)) @@ -184,7 +185,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;; These are the 68020 versions (let-syntax ((define-mul-and-div - (macro (keyword word-form-bit long-form-bit) + (lambda (keyword word-form-bit long-form-bit) `(define-instruction ,keyword (((? sgn us) W (? ea ea-d) (D (? n))) (WORD (1 #b1) @@ -284,7 +285,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Bitwise Logical (let-syntax ((define-bitwise-logical - (macro (keyword opcode Iopcode) + (lambda (keyword opcode Iopcode) `(define-instruction ,keyword (((? s bwl ssym) (? ea ea-d) (D (? rx))) (WORD (4 ,opcode) @@ -345,7 +346,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Shift (let-syntax ((define-shift-instruction - (macro (keyword bits) + (lambda (keyword bits) `(define-instruction ,keyword (((? d rl) (? s bwl) (D (? rx)) (D (? ry))) (WORD (4 #b1110) @@ -379,7 +380,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Bit Manipulation (let-syntax ((define-bit-manipulation - (macro (keyword bits ea-register-target ea-immediate-target) + (lambda (keyword bits ea-register-target ea-immediate-target) `(define-instruction ,keyword (((D (? rx)) (? ea ,ea-register-target)) (WORD (4 #b0000) diff --git a/v7/src/compiler/machines/bobcat/instr3.scm b/v7/src/compiler/machines/bobcat/instr3.scm index 6ae4c1914..db2e73f0f 100644 --- a/v7/src/compiler/machines/bobcat/instr3.scm +++ b/v7/src/compiler/machines/bobcat/instr3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr3.scm,v 1.18 1999/01/02 06:06:43 cph Exp $ +$Id: instr3.scm,v 1.19 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1988, 1990, 1999 Massachusetts Institute of Technology +Copyright (c) 1988, 1990, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; 68000 Instruction Set Description @@ -45,7 +46,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-branch-instruction - (macro (opcode prefix field . fall-through) + (lambda (opcode prefix field . fall-through) `(define-instruction ,opcode ((,@prefix B (@PCO (? o))) (WORD ,@field diff --git a/v7/src/compiler/machines/bobcat/instr4.scm b/v7/src/compiler/machines/bobcat/instr4.scm index bd80ea68b..32e15e1d1 100644 --- a/v7/src/compiler/machines/bobcat/instr4.scm +++ b/v7/src/compiler/machines/bobcat/instr4.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr4.scm,v 1.4 1999/01/02 06:06:43 cph Exp $ +$Id: instr4.scm,v 1.5 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1987, 1999 Massachusetts Institute of Technology +Copyright (c) 1987, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; 68020 Instruction Set Description (in addition to 68000) @@ -28,7 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-bitfield-manipulation-1 - (macro (keyword bits ea-mode) + (lambda (keyword bits ea-mode) `(define-instruction ,keyword (((? ea ,ea-mode) (& (? offset)) (& (? width)) (D (? reg))) (WORD (4 #b1110) @@ -87,7 +88,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-bitfield-manipulation-2 - (macro (keyword bits ea-mode) + (lambda (keyword bits ea-mode) `(define-instruction ,keyword (((? ea ,ea-mode) (& (? offset)) (& (? width))) (WORD (4 #b1110) diff --git a/v7/src/compiler/machines/bobcat/lapgen.scm b/v7/src/compiler/machines/bobcat/lapgen.scm index 6323460bf..fffb5eb0b 100644 --- a/v7/src/compiler/machines/bobcat/lapgen.scm +++ b/v7/src/compiler/machines/bobcat/lapgen.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: lapgen.scm,v 4.51 1999/01/02 06:06:43 cph Exp $ +$Id: lapgen.scm,v 4.52 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; RTL Rules for 68020. Part 1 @@ -744,7 +745,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((binary-fixnum - (macro (name instr identity?) + (lambda (name instr identity?) `(begin (define-fixnum-method ',name fixnum-methods/2-args (lambda (target source) @@ -980,7 +981,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name instruction-name) + (lambda (primitive-name instruction-name) `(DEFINE-FLONUM-METHOD ',primitive-name FLONUM-METHODS/1-ARG (LAMBDA (SOURCE TARGET) (IF (EFFECTIVE-ADDRESS/FLOAT-REGISTER? SOURCE) @@ -1008,7 +1009,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name instruction-name) + (lambda (primitive-name instruction-name) `(DEFINE-FLONUM-METHOD ',primitive-name FLONUM-METHODS/2-ARGS (LAMBDA (TARGET SOURCE) (IF (EFFECTIVE-ADDRESS/FLOAT-REGISTER? SOURCE) @@ -1171,7 +1172,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define-integrable reg:stack-guard (INST-EA (@AO 6 #X002C))) (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() @@ -1194,7 +1195,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. quotient remainder modulo)) (let-syntax ((define-entries - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() diff --git a/v7/src/compiler/machines/bobcat/machin.scm b/v7/src/compiler/machines/bobcat/machin.scm index b73ce5b40..492f0f4f9 100644 --- a/v7/src/compiler/machines/bobcat/machin.scm +++ b/v7/src/compiler/machines/bobcat/machin.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: machin.scm,v 4.32 1999/01/02 06:06:43 cph Exp $ +$Id: machin.scm,v 4.33 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Machine Model for the Motorola MC68K family @@ -170,7 +171,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define-integrable MC68K/closure-format 'MC68040) ; or MC68020 (let-syntax ((define/format-dependent - (macro (name) + (lambda (name) `(define ,name (case MC68K/closure-format ((MC68020) diff --git a/v7/src/compiler/machines/bobcat/rules3.scm b/v7/src/compiler/machines/bobcat/rules3.scm index bc9d54df5..6ad2ebe15 100644 --- a/v7/src/compiler/machines/bobcat/rules3.scm +++ b/v7/src/compiler/machines/bobcat/rules3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rules3.scm,v 4.41 1999/01/02 06:06:43 cph Exp $ +$Id: rules3.scm,v 4.42 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Invocations and Entries @@ -163,7 +164,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-special-primitive-invocation - (macro (name) + (lambda (name) `(define-rule statement (INVOCATION:SPECIAL-PRIMITIVE (? frame-size) @@ -174,7 +175,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ,(symbol-append 'CODE:COMPILER- name))))) (define-optimized-primitive-invocation - (macro (name) + (lambda (name) `(define-rule statement (INVOCATION:SPECIAL-PRIMITIVE (? frame-size) @@ -751,7 +752,7 @@ long-word aligned and there is no need for shuffling. (vector->list entries))))) (let-syntax ((define/format-dependent - (macro (name1 name2) + (lambda (name1 name2) `(define ,name1 (case MC68K/closure-format ((MC68020) diff --git a/v7/src/compiler/machines/i386/assmd.scm b/v7/src/compiler/machines/i386/assmd.scm index 03d9ce1fd..f3060f5dd 100644 --- a/v7/src/compiler/machines/i386/assmd.scm +++ b/v7/src/compiler/machines/i386/assmd.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Id: assmd.scm,v 1.3 1999/01/02 06:06:43 cph Exp $ -$MC68020-Header: assmd.scm,v 1.36 89/08/28 18:33:33 GMT cph Exp $ +$Id: assmd.scm,v 1.4 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992, 1999 Massachusetts Institute of Technology +Copyright (c) 1992, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,14 +16,15 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Assembler Machine Dependencies. Intel 386 version (declare (usual-integrations)) -(let-syntax ((ucode-type (macro (name) `',(microcode-type name)))) +(let-syntax ((ucode-type (lambda (name) `',(microcode-type name)))) (define-integrable maximum-padding-length ;; Instructions can be any number of bytes long. diff --git a/v7/src/compiler/machines/i386/dassm1.scm b/v7/src/compiler/machines/i386/dassm1.scm index 298e6e566..b75513332 100644 --- a/v7/src/compiler/machines/i386/dassm1.scm +++ b/v7/src/compiler/machines/i386/dassm1.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: dassm1.scm,v 1.10 2001/08/10 17:29:03 cph Exp $ +$Id: dassm1.scm,v 1.11 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology @@ -145,7 +145,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (cond ((not (< index end)) 'DONE) ((object-type? (let-syntax ((ucode-type - (macro (name) (microcode-type name)))) + (lambda (name) (microcode-type name)))) (ucode-type linkage-section)) (system-vector-ref block index)) (loop (disassembler/write-linkage-section block diff --git a/v7/src/compiler/machines/i386/dassm2.scm b/v7/src/compiler/machines/i386/dassm2.scm index aa8b55da6..49ebeb944 100644 --- a/v7/src/compiler/machines/i386/dassm2.scm +++ b/v7/src/compiler/machines/i386/dassm2.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: dassm2.scm,v 1.9 1999/01/02 06:06:43 cph Exp $ +$Id: dassm2.scm,v 1.10 2001/12/20 21:45:24 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Intel i386 Disassembler: Top Level @@ -26,9 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define (disassembler/read-variable-cache block index) (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type quad) @@ -184,9 +185,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (with-absolutely-no-interrupts (lambda () (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type compiled-entry) diff --git a/v7/src/compiler/machines/i386/dassm3.scm b/v7/src/compiler/machines/i386/dassm3.scm index f4553e97f..b5986ad32 100644 --- a/v7/src/compiler/machines/i386/dassm3.scm +++ b/v7/src/compiler/machines/i386/dassm3.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: dassm3.scm,v 1.7 2001/12/16 06:01:31 cph Exp $ +$Id: dassm3.scm,v 1.8 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992, 1999, 2001 Massachusetts Institute of Technology @@ -438,7 +438,7 @@ USA. next))))) (define decode-fp - (let-syntax ((IN (macro (body . bindings) + (let-syntax ((IN (lambda (body . bindings) `(LET ,bindings ,body)))) (IN diff --git a/v7/src/compiler/machines/i386/instr1.scm b/v7/src/compiler/machines/i386/instr1.scm index 2b5f88f42..12ec2d8a3 100644 --- a/v7/src/compiler/machines/i386/instr1.scm +++ b/v7/src/compiler/machines/i386/instr1.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: instr1.scm,v 1.13 2001/12/20 20:51:15 cph Exp $ +$Id: instr1.scm,v 1.14 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992, 1999, 2001 Massachusetts Institute of Technology @@ -68,7 +68,7 @@ USA. (let-syntax ((define-arithmetic-instruction - (macro (mnemonic opcode digit) + (lambda (mnemonic opcode digit) `(define-instruction ,mnemonic ((W (? target r/mW) (R (? source))) (BYTE (8 ,(1+ opcode))) @@ -170,7 +170,7 @@ USA. (let-syntax ((define-bit-test-instruction - (macro (mnemonic opcode digit) + (lambda (mnemonic opcode digit) `(define-instruction ,mnemonic (((? target r/mW) (& (? posn))) (BYTE (8 #x0f) @@ -224,7 +224,7 @@ USA. (let-syntax ((define-string-instruction - (macro (mnemonic opcode) + (lambda (mnemonic opcode) `(define-instruction ,mnemonic ((W) (BYTE (8 ,(1+ opcode)))) @@ -260,7 +260,7 @@ USA. (let-syntax ((define-inc/dec - (macro (mnemonic digit opcode) + (lambda (mnemonic digit opcode) `(define-instruction ,mnemonic ((W (R (? reg))) (BYTE (8 (+ ,opcode reg)))) @@ -278,7 +278,7 @@ USA. (let-syntax ((define-mul/div - (macro (mnemonic digit) + (lambda (mnemonic digit) `(define-instruction ,mnemonic ((W (R 0) (? operand r/mW)) (BYTE (8 #xf7)) @@ -363,7 +363,7 @@ USA. (let-syntax ((define-jump-instruction - (macro (mnemonic opcode1 opcode2) + (lambda (mnemonic opcode1 opcode2) `(define-instruction ,mnemonic ;; This assumes that *ADDRESS-SIZE* is 4 (32-bit mode) (((@PCR (? dest))) @@ -428,7 +428,7 @@ USA. (let-syntax ((define-loop-instruction - (macro (mnemonic opcode) + (lambda (mnemonic opcode) `(define-instruction ,mnemonic ((B (@PCR (? dest))) (BYTE (8 ,opcode) @@ -514,7 +514,7 @@ USA. (let-syntax ((define-load/store-state - (macro (mnemonic opcode digit) + (lambda (mnemonic opcode digit) `(define-instruction ,mnemonic (((? operand mW)) (BYTE (8 #x0f) diff --git a/v7/src/compiler/machines/i386/instr2.scm b/v7/src/compiler/machines/i386/instr2.scm index a54fa3300..d5d80dac1 100644 --- a/v7/src/compiler/machines/i386/instr2.scm +++ b/v7/src/compiler/machines/i386/instr2.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: instr2.scm,v 1.7 2001/12/20 20:51:15 cph Exp $ +$Id: instr2.scm,v 1.8 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992, 1999, 2001 Massachusetts Institute of Technology @@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-load-segment - (macro (mnemonic . bytes) + (lambda (mnemonic . bytes) `(define-instruction ,mnemonic (((R (? reg)) (? pointer mW)) (BYTE ,@(map (lambda (byte) @@ -65,7 +65,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-data-extension - (macro (mnemonic opcode) + (lambda (mnemonic opcode) `(define-instruction ,mnemonic ((B (R (? target)) (? source r/mB)) (BYTE (8 #x0f) @@ -82,7 +82,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-unary - (macro (mnemonic digit) + (lambda (mnemonic digit) `(define-instruction ,mnemonic ((W (? operand r/mW)) (BYTE (8 #xf7)) @@ -337,7 +337,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-rotate/shift - (macro (mnemonic digit) + (lambda (mnemonic digit) `(define-instruction ,mnemonic ((W (? operand r/mW) (& 1)) (BYTE (8 #xd1)) @@ -376,7 +376,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-double-shift - (macro (mnemonic opcode) + (lambda (mnemonic opcode) `(define-instruction ,mnemonic ((W (? target r/mW) (R (? source)) (& (? count))) (BYTE (8 #x0f) @@ -411,7 +411,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-setcc-instruction - (macro (mnemonic opcode) + (lambda (mnemonic opcode) `(define-instruction ,mnemonic (((? target r/mB)) (BYTE (8 #x0f) diff --git a/v7/src/compiler/machines/i386/instrf.scm b/v7/src/compiler/machines/i386/instrf.scm index f0477472a..08116c0a0 100644 --- a/v7/src/compiler/machines/i386/instrf.scm +++ b/v7/src/compiler/machines/i386/instrf.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: instrf.scm,v 1.15 2001/12/20 20:51:15 cph Exp $ +$Id: instrf.scm,v 1.16 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992, 1999, 2001 Massachusetts Institute of Technology @@ -25,7 +25,7 @@ along with this program; if not, write to the Free Software (let-syntax ((define-binary-flonum - (macro (mnemonic pmnemonic imnemonic digit opcode1 opcode2) + (lambda (mnemonic pmnemonic imnemonic digit opcode1 opcode2) `(begin (define-instruction ,mnemonic (((ST 0) (ST (? i))) @@ -115,7 +115,7 @@ along with this program; if not, write to the Free Software (let-syntax ((define-flonum-comparison - (macro (mnemonic digit opcode) + (lambda (mnemonic digit opcode) `(define-instruction ,mnemonic (((ST 0) (ST (? i))) (BYTE (8 #xd8) @@ -147,7 +147,7 @@ along with this program; if not, write to the Free Software (let-syntax ((define-flonum-integer-comparison - (macro (mnemonic digit) + (lambda (mnemonic digit) `(define-instruction ,mnemonic ((L (? source mW)) (BYTE (8 #xda)) @@ -162,7 +162,7 @@ along with this program; if not, write to the Free Software (let-syntax ((define-flonum-integer-memory - (macro (mnemonic digit1 digit2) + (lambda (mnemonic digit1 digit2) `(define-instruction ,mnemonic ,@(if (not digit2) `() @@ -188,7 +188,7 @@ along with this program; if not, write to the Free Software (let-syntax ((define-flonum-memory - (macro (mnemonic digit1 digit2 opcode1 opcode2) + (lambda (mnemonic digit1 digit2 opcode1 opcode2) `(define-instruction ,mnemonic (((ST (? i))) (BYTE (8 ,opcode1) @@ -222,7 +222,7 @@ along with this program; if not, write to the Free Software (let-syntax ((define-flonum-state - (macro (mnemonic opcode digit mnemonic2) + (lambda (mnemonic opcode digit mnemonic2) `(begin ,@(if (not mnemonic2) `() @@ -279,7 +279,7 @@ along with this program; if not, write to the Free Software (let-syntax ((define-binary-flonum - (macro (mnemonic opcode1 opcode2) + (lambda (mnemonic opcode1 opcode2) `(define-instruction ,mnemonic (((ST 0) (ST (? i))) (BYTE (8 ,opcode1) diff --git a/v7/src/compiler/machines/i386/lapgen.scm b/v7/src/compiler/machines/i386/lapgen.scm index 8abfd2cc8..0cd2e5925 100644 --- a/v7/src/compiler/machines/i386/lapgen.scm +++ b/v7/src/compiler/machines/i386/lapgen.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: lapgen.scm,v 1.28 2001/12/16 06:01:31 cph Exp $ +$Id: lapgen.scm,v 1.29 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology @@ -568,7 +568,7 @@ USA. (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() @@ -605,7 +605,7 @@ USA. ,@(invoke-hook/call entry:compiler-scheme-to-interface/call))) (let-syntax ((define-entries - (macro (start high . names) + (lambda (start high . names) (define (loop names index high) (cond ((null? names) '()) diff --git a/v7/src/compiler/machines/i386/rules3.scm b/v7/src/compiler/machines/i386/rules3.scm index 85e04dd4e..f9b37740f 100644 --- a/v7/src/compiler/machines/i386/rules3.scm +++ b/v7/src/compiler/machines/i386/rules3.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: rules3.scm,v 1.35 2001/12/16 06:01:32 cph Exp $ +$Id: rules3.scm,v 1.36 2001/12/20 21:45:24 cph Exp $ Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology @@ -172,11 +172,11 @@ USA. ;; (let-syntax ((invoke #| - (macro (code entry) + (lambda (code entry) entry ; ignored (for now) `(invoke-interface ,code)) |# - (macro (code entry) + (lambda (code entry) code ; ignored `(invoke-hook ,entry)))) @@ -221,7 +221,7 @@ USA. (let-syntax ((define-special-primitive-invocation - (macro (name) + (lambda (name) `(define-rule statement (INVOCATION:SPECIAL-PRIMITIVE (? frame-size) @@ -233,7 +233,7 @@ USA. ,(symbol-append 'CODE:COMPILER- name))))) (define-optimized-primitive-invocation - (macro (name) + (lambda (name) `(define-rule statement (INVOCATION:SPECIAL-PRIMITIVE (? frame-size) @@ -245,7 +245,7 @@ USA. ,(symbol-append 'ENTRY:COMPILER- name)))))) (let-syntax ((define-primitive-invocation - (macro (name) + (lambda (name) #| `(define-special-primitive-invocation ,name) |# diff --git a/v7/src/compiler/machines/i386/rulfix.scm b/v7/src/compiler/machines/i386/rulfix.scm index f30fb759c..a3e72d8fc 100644 --- a/v7/src/compiler/machines/i386/rulfix.scm +++ b/v7/src/compiler/machines/i386/rulfix.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rulfix.scm,v 1.31 1999/01/02 06:06:43 cph Exp $ +$Id: rulfix.scm,v 1.32 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Fixnum operations. @@ -402,7 +403,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((binary-operation - (macro (name instr commutative? idempotent?) + (lambda (name instr commutative? idempotent?) `(define-arithmetic-method ',name fixnum-methods/2-args (fixnum-2-args/standard ,commutative? diff --git a/v7/src/compiler/machines/i386/rulflo.scm b/v7/src/compiler/machines/i386/rulflo.scm index e5deca525..290fc1e19 100644 --- a/v7/src/compiler/machines/i386/rulflo.scm +++ b/v7/src/compiler/machines/i386/rulflo.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rulflo.scm,v 1.22 1999/01/02 06:06:43 cph Exp $ +$Id: rulflo.scm,v 1.23 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Flonum rules @@ -243,7 +244,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/1-arg (flonum-unary-operation/general (lambda (target source) @@ -489,7 +490,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name op1%2 op1%2p op2%1 op2%1p) + (lambda (primitive-name op1%2 op1%2p op2%1 op2%1p) `(begin (define-arithmetic-method ',primitive-name flonum-methods/2-args (flonum-binary-operation diff --git a/v7/src/compiler/machines/mips/assmd.scm b/v7/src/compiler/machines/mips/assmd.scm index 89dd2b969..6ae62d596 100644 --- a/v7/src/compiler/machines/mips/assmd.scm +++ b/v7/src/compiler/machines/mips/assmd.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Id: assmd.scm,v 1.3 1999/01/02 06:06:43 cph Exp $ -$MC68020-Header: assmd.scm,v 1.36 89/08/28 18:33:33 GMT cph Exp $ +$Id: assmd.scm,v 1.4 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988, 1989, 1990, 1999 Massachusetts Institute of Technology +Copyright (c) 1988-1990, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,14 +16,15 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Assembler Machine Dependencies (declare (usual-integrations)) -(let-syntax ((ucode-type (macro (name) `',(microcode-type name)))) +(let-syntax ((ucode-type (lambda (name) `',(microcode-type name)))) (define-integrable maximum-padding-length ;; Instruction length is always a multiple of 32 bits diff --git a/v7/src/compiler/machines/mips/dassm1.scm b/v7/src/compiler/machines/mips/dassm1.scm index ff4e098c7..e704f67be 100644 --- a/v7/src/compiler/machines/mips/dassm1.scm +++ b/v7/src/compiler/machines/mips/dassm1.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: dassm1.scm,v 1.5 2001/08/10 17:29:10 cph Exp $ +$Id: dassm1.scm,v 1.6 2001/12/20 21:45:25 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -135,7 +135,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (cond ((not (< index end)) 'DONE) ((object-type? (let-syntax ((ucode-type - (macro (name) (microcode-type name)))) + (lambda (name) (microcode-type name)))) (ucode-type linkage-section)) (system-vector-ref block index)) (loop (disassembler/write-linkage-section block diff --git a/v7/src/compiler/machines/mips/dassm2.scm b/v7/src/compiler/machines/mips/dassm2.scm index 2736f12af..058f6c05c 100644 --- a/v7/src/compiler/machines/mips/dassm2.scm +++ b/v7/src/compiler/machines/mips/dassm2.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Id: dassm2.scm,v 1.5 1999/01/02 06:06:43 cph Exp $ -$MC68020-Header: dassm2.scm,v 4.16 89/12/11 06:16:42 GMT cph Exp $ +$Id: dassm2.scm,v 1.6 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; MIPS Disassembler: Top Level @@ -27,9 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define (disassembler/read-variable-cache block index) (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type quad) @@ -193,9 +193,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (with-absolutely-no-interrupts (lambda () (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type compiled-entry) diff --git a/v7/src/compiler/machines/mips/instr1.scm b/v7/src/compiler/machines/mips/instr1.scm index 17920125a..869f15d23 100644 --- a/v7/src/compiler/machines/mips/instr1.scm +++ b/v7/src/compiler/machines/mips/instr1.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr1.scm,v 1.7 1999/01/02 06:06:43 cph Exp $ +$Id: instr1.scm,v 1.8 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; MIPS instruction set @@ -28,7 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((arithmetic-immediate-instruction - (macro (keyword opcode special-opcode) + (lambda (keyword opcode special-opcode) `(define-instruction ,keyword (((? destination) (? source) (? immediate)) (VARIABLE-WIDTH (evaluated-immediate immediate) @@ -75,7 +76,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((unsigned-immediate-instruction - (macro (keyword opcode special-opcode) + (lambda (keyword opcode special-opcode) `(define-instruction ,keyword (((? destination) (? source) (? immediate)) (VARIABLE-WIDTH (evaluated-immediate immediate) @@ -142,7 +143,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((3-operand-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? destination) (? source-1) (? source-2)) (LONG (6 0) @@ -164,7 +165,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((shift-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? destination) (? source) (? amount)) (LONG (6 0) @@ -179,7 +180,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((shift-variable-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? destination) (? source) (? amount)) (LONG (6 0) @@ -194,7 +195,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((div/mul-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? source-1) (? source-2)) (LONG (6 0) @@ -210,7 +211,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((from-hi/lo-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? destination)) (LONG (6 0) @@ -224,7 +225,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #| (let-syntax ((to-hi/lo-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? source)) (LONG (6 0) @@ -238,7 +239,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((jump-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? address)) (LONG (6 ,opcode) @@ -266,7 +267,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((move-coprocessor-instruction - (macro (keyword opcode move-op) + (lambda (keyword opcode move-op) `(define-instruction ,keyword (((? rt-mci) (? rd-mci)) (LONG (6 ,opcode) @@ -294,7 +295,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #| (let-syntax ((coprocessor-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? cofun)) (LONG (6 ,opcode) @@ -307,7 +308,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((cop0-instruction - (macro (keyword cp0-op) + (lambda (keyword cp0-op) `(define-instruction ,keyword (() (LONG (6 16) diff --git a/v7/src/compiler/machines/mips/instr2a.scm b/v7/src/compiler/machines/mips/instr2a.scm index 1e1106898..1d917becd 100644 --- a/v7/src/compiler/machines/mips/instr2a.scm +++ b/v7/src/compiler/machines/mips/instr2a.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr2a.scm,v 1.5 1999/01/02 06:06:43 cph Exp $ +$Id: instr2a.scm,v 1.6 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; MIPS instruction set, part 2a @@ -27,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((branch - (macro (keyword match-phrase forward reverse) + (lambda (keyword match-phrase forward reverse) `(define-instruction ,keyword ((,@match-phrase (@PCO (? offset))) (LONG ,@forward diff --git a/v7/src/compiler/machines/mips/instr2b.scm b/v7/src/compiler/machines/mips/instr2b.scm index 0f73e461c..7272066cb 100644 --- a/v7/src/compiler/machines/mips/instr2b.scm +++ b/v7/src/compiler/machines/mips/instr2b.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr2b.scm,v 1.4 1999/01/02 06:06:43 cph Exp $ +$Id: instr2b.scm,v 1.5 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; MIPS instruction set, part 2b @@ -27,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((load/store-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? source/dest-reg) (OFFSET (? offset-ls) (? base-reg))) (VARIABLE-WIDTH (delta offset-ls) diff --git a/v7/src/compiler/machines/mips/instr3.scm b/v7/src/compiler/machines/mips/instr3.scm index 0e7e9fd94..1693aef42 100644 --- a/v7/src/compiler/machines/mips/instr3.scm +++ b/v7/src/compiler/machines/mips/instr3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr3.scm,v 1.3 1999/01/02 06:06:43 cph Exp $ +$Id: instr3.scm,v 1.4 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; MIPS instruction set, part 3 @@ -26,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((three-reg - (macro (keyword function-code) + (lambda (keyword function-code) `(BEGIN (DEFINE-INSTRUCTION ,(symbol-append keyword '.S) (((? fd) (? fs) (? ft)) @@ -54,7 +55,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((two-reg - (macro (keyword function-code) + (lambda (keyword function-code) `(BEGIN (DEFINE-INSTRUCTION ,(symbol-append keyword '.S) (((? fd) (? fs)) @@ -140,7 +141,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((compare - (macro (keyword conditions) + (lambda (keyword conditions) `(BEGIN (DEFINE-INSTRUCTION ,(symbol-append keyword '.S) (((? fs) (? ft)) diff --git a/v7/src/compiler/machines/mips/lapgen.scm b/v7/src/compiler/machines/mips/lapgen.scm index ed8cf7d5b..52fdcc330 100644 --- a/v7/src/compiler/machines/mips/lapgen.scm +++ b/v7/src/compiler/machines/mips/lapgen.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: lapgen.scm,v 1.16 1999/01/02 06:06:43 cph Exp $ +$Id: lapgen.scm,v 1.17 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; RTL Rules for MIPS. Shared utilities. @@ -604,7 +605,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Codes and Hooks (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() diff --git a/v7/src/compiler/machines/mips/mips.scm b/v7/src/compiler/machines/mips/mips.scm index c76cbf3e9..44c9dd628 100644 --- a/v7/src/compiler/machines/mips/mips.scm +++ b/v7/src/compiler/machines/mips/mips.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: mips.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: mips.scm,v 1.3 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987, 1989, 1990, 1999 Massachusetts Institute of Technology +Copyright (c) 1987, 1989, 1990, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; MIPS instruction set @@ -24,7 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (declare (usual-integrations)) (let-syntax - ((opcodes (macro (suffix names) + ((opcodes (lambda (suffix names) (let loop ((value 0) (names names) (result '())) diff --git a/v7/src/compiler/machines/mips/rules3.scm b/v7/src/compiler/machines/mips/rules3.scm index 06a9f7c54..03c68c953 100644 --- a/v7/src/compiler/machines/mips/rules3.scm +++ b/v7/src/compiler/machines/mips/rules3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rules3.scm,v 1.18 1999/01/02 06:06:43 cph Exp $ +$Id: rules3.scm,v 1.19 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Invocations and Entries @@ -181,7 +182,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-special-primitive-invocation - (macro (name) + (lambda (name) `(DEFINE-RULE STATEMENT (INVOCATION:SPECIAL-PRIMITIVE (? FRAME-SIZE) diff --git a/v7/src/compiler/machines/mips/rulflo.scm b/v7/src/compiler/machines/mips/rulflo.scm index d4961e07c..432927d86 100644 --- a/v7/src/compiler/machines/mips/rulflo.scm +++ b/v7/src/compiler/machines/mips/rulflo.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rulflo.scm,v 1.8 1999/01/02 06:06:43 cph Exp $ +$Id: rulflo.scm,v 1.9 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1989-1999 Massachusetts Institute of Technology +Copyright (c) 1989-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Flonum rules @@ -154,7 +155,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/1-arg (lambda (target source) (LAP (,opcode ,',target ,',source))))))) @@ -182,7 +183,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/2-args (lambda (target source1 source2) (LAP (,opcode ,',target ,',source1 ,',source2))))))) diff --git a/v7/src/compiler/machines/sparc/assmd.scm b/v7/src/compiler/machines/sparc/assmd.scm index 89f7619ae..28cd07f05 100644 --- a/v7/src/compiler/machines/sparc/assmd.scm +++ b/v7/src/compiler/machines/sparc/assmd.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Id: assmd.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ -$MC68020-Header: assmd.scm,v 1.36 89/08/28 18:33:33 GMT cph Exp $ +$Id: assmd.scm,v 1.3 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988, 1989, 1990, 1999 Massachusetts Institute of Technology +Copyright (c) 1988-1990, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,14 +16,15 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Assembler Machine Dependencies (declare (usual-integrations)) -(let-syntax ((ucode-type (macro (name) `',(microcode-type name)))) +(let-syntax ((ucode-type (lambda (name) `',(microcode-type name)))) (define-integrable maximum-padding-length ;; Instruction length is always a multiple of 32 bits diff --git a/v7/src/compiler/machines/sparc/instr1.scm b/v7/src/compiler/machines/sparc/instr1.scm index 408a381d1..b4a374580 100644 --- a/v7/src/compiler/machines/sparc/instr1.scm +++ b/v7/src/compiler/machines/sparc/instr1.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr1.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: instr1.scm,v 1.3 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; MIPS instruction set @@ -28,7 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((arithmetic-immediate-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? destination) (? source) (? immediate)) (VARIABLE-WIDTH (evaluated-immediate immediate) @@ -126,7 +127,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((3-operand-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? destination) (? source-1) (? source-2)) (LONG (2 2) @@ -172,7 +173,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((shift-instruction-immediate - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? destination) (? source) (? amount)) (LONG (2 2) diff --git a/v7/src/compiler/machines/sparc/instr2a.scm b/v7/src/compiler/machines/sparc/instr2a.scm index d149590bb..5de090155 100644 --- a/v7/src/compiler/machines/sparc/instr2a.scm +++ b/v7/src/compiler/machines/sparc/instr2a.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr2a.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: instr2a.scm,v 1.3 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; SPARC instruction set, part 2a @@ -27,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((branch - (macro (keyword annul condition) + (lambda (keyword annul condition) `(define-instruction ,keyword (((@PCO (? offset))) (LONG (2 0) diff --git a/v7/src/compiler/machines/sparc/instr2b.scm b/v7/src/compiler/machines/sparc/instr2b.scm index 90e68eb9a..a68029a65 100644 --- a/v7/src/compiler/machines/sparc/instr2b.scm +++ b/v7/src/compiler/machines/sparc/instr2b.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr2b.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: instr2b.scm,v 1.3 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; SPARC instruction set, part 2b @@ -27,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((load/store-instruction - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword (((? source/dest-reg) (OFFSET (? offset-ls) (? base-reg))) (VARIABLE-WIDTH (delta offset-ls) diff --git a/v7/src/compiler/machines/sparc/instr3.scm b/v7/src/compiler/machines/sparc/instr3.scm index d130118c2..14d96da6a 100644 --- a/v7/src/compiler/machines/sparc/instr3.scm +++ b/v7/src/compiler/machines/sparc/instr3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr3.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: instr3.scm,v 1.3 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; SPARC instruction set, part 3 @@ -25,7 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((float-instruction-3 - (macro (keyword major minor) + (lambda (keyword major minor) `(define-instruction ,keyword (((? destination) (? source1) (? source2)) (LONG (2 2) @@ -51,7 +52,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((float-instruction-cmp - (macro (keyword major minor) + (lambda (keyword major minor) `(define-instruction ,keyword (((? source1) (? source2)) (LONG (2 2) @@ -69,7 +70,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((float-instruction-2 - (macro (keyword major minor) + (lambda (keyword major minor) `(define-instruction ,keyword (((? destination) (? source)) (LONG (2 2) diff --git a/v7/src/compiler/machines/sparc/lapgen.scm b/v7/src/compiler/machines/sparc/lapgen.scm index 2cb2335ff..670b0efc5 100644 --- a/v7/src/compiler/machines/sparc/lapgen.scm +++ b/v7/src/compiler/machines/sparc/lapgen.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: lapgen.scm,v 1.3 1999/01/02 06:06:43 cph Exp $ +$Id: lapgen.scm,v 1.4 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; RTL Rules for SPARC. Shared utilities. @@ -598,7 +599,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Codes and Hooks (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() diff --git a/v7/src/compiler/machines/sparc/rules3.scm b/v7/src/compiler/machines/sparc/rules3.scm index f3b865472..d58ce9fae 100644 --- a/v7/src/compiler/machines/sparc/rules3.scm +++ b/v7/src/compiler/machines/sparc/rules3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rules3.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: rules3.scm,v 1.3 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Invocations and Entries @@ -157,7 +158,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-special-primitive-invocation - (macro (name) + (lambda (name) `(DEFINE-RULE STATEMENT (INVOCATION:SPECIAL-PRIMITIVE (? FRAME-SIZE) diff --git a/v7/src/compiler/machines/sparc/rulflo.scm b/v7/src/compiler/machines/sparc/rulflo.scm index dde33aa35..e474b0185 100644 --- a/v7/src/compiler/machines/sparc/rulflo.scm +++ b/v7/src/compiler/machines/sparc/rulflo.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rulflo.scm,v 1.2 1999/01/02 06:06:43 cph Exp $ +$Id: rulflo.scm,v 1.3 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1989-1999 Massachusetts Institute of Technology +Copyright (c) 1989-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Flonum rules @@ -81,7 +82,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/1-arg (lambda (target source) (LAP (,opcode ,',target ,',source))))))) @@ -109,7 +110,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/2-args (lambda (target source1 source2) (LAP (,opcode ,',target ,',source1 ,',source2))))))) diff --git a/v7/src/compiler/machines/spectrum/assmd.scm b/v7/src/compiler/machines/spectrum/assmd.scm index 28d1490da..ded9e1219 100644 --- a/v7/src/compiler/machines/spectrum/assmd.scm +++ b/v7/src/compiler/machines/spectrum/assmd.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Id: assmd.scm,v 1.31 1999/01/02 06:06:43 cph Exp $ -$MC68020-Header: assmd.scm,v 1.36 89/08/28 18:33:33 GMT cph Exp $ +$Id: assmd.scm,v 1.32 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988, 1989, 1990, 1999 Massachusetts Institute of Technology +Copyright (c) 1988, 1989, 1990, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,14 +16,15 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Assembler Machine Dependencies (declare (usual-integrations)) -(let-syntax ((ucode-type (macro (name) `',(microcode-type name)))) +(let-syntax ((ucode-type (lambda (name) `',(microcode-type name)))) (define-integrable maximum-padding-length ;; Instruction length is always a multiple of 32 bits diff --git a/v7/src/compiler/machines/spectrum/dassm1.scm b/v7/src/compiler/machines/spectrum/dassm1.scm index 7fc25fd81..40107a40d 100644 --- a/v7/src/compiler/machines/spectrum/dassm1.scm +++ b/v7/src/compiler/machines/spectrum/dassm1.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: dassm1.scm,v 4.20 2001/08/10 17:29:18 cph Exp $ +$Id: dassm1.scm,v 4.21 2001/12/20 21:45:25 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -135,7 +135,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (cond ((not (< index end)) 'DONE) ((object-type? (let-syntax ((ucode-type - (macro (name) (microcode-type name)))) + (lambda (name) (microcode-type name)))) (ucode-type linkage-section)) (system-vector-ref block index)) (loop (disassembler/write-linkage-section block diff --git a/v7/src/compiler/machines/spectrum/dassm2.scm b/v7/src/compiler/machines/spectrum/dassm2.scm index 3f1c7d5df..52d4ed065 100644 --- a/v7/src/compiler/machines/spectrum/dassm2.scm +++ b/v7/src/compiler/machines/spectrum/dassm2.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: dassm2.scm,v 4.21 1999/01/02 06:06:43 cph Exp $ +$Id: dassm2.scm,v 4.22 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Spectrum Disassembler: Top Level @@ -26,9 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define (disassembler/read-variable-cache block index) (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type quad) @@ -232,9 +233,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (unsigned-integer->bit-string 32 address) #*11111100000000000000000000000000))) (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type compiled-entry) diff --git a/v7/src/compiler/machines/spectrum/instr1.scm b/v7/src/compiler/machines/spectrum/instr1.scm index b46c0c9f0..78e7d72db 100644 --- a/v7/src/compiler/machines/spectrum/instr1.scm +++ b/v7/src/compiler/machines/spectrum/instr1.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr1.scm,v 1.4 1999/01/02 06:06:43 cph Exp $ +$Id: instr1.scm,v 1.5 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; HP Spectrum instruction utilities @@ -263,7 +264,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. `(,name ,value)))) (let-syntax ((define-operator - (macro (name handler) + (lambda (name handler) `(define ,name (make-operator ',name ,handler))))) diff --git a/v7/src/compiler/machines/spectrum/instr2.scm b/v7/src/compiler/machines/spectrum/instr2.scm index 5457a55c6..a2a9d88dd 100644 --- a/v7/src/compiler/machines/spectrum/instr2.scm +++ b/v7/src/compiler/machines/spectrum/instr2.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: instr2.scm,v 1.8 2001/12/20 20:51:15 cph Exp $ +$Id: instr2.scm,v 1.9 2001/12/20 21:45:25 cph Exp $ Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology @@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;;; 1 -- this may be inappropriate for assembly-language programs, but ;;; is OK for the output of the compiler. (let-syntax ((long-load - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword ((() (OFFSET (? offset) (? space) (? base)) (? reg)) (VARIABLE-WIDTH (disp offset) @@ -56,7 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (14 (remainder disp #x800) RIGHT-SIGNED)))))))) (long-store - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword ((() (? reg) (OFFSET (? offset) (? space) (? base))) (VARIABLE-WIDTH (disp offset) @@ -80,7 +80,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (14 (remainder disp #x800) RIGHT-SIGNED)))))))) (load-offset - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword ((() (OFFSET (? offset) 0 (? base)) (? reg)) (VARIABLE-WIDTH (disp offset) @@ -104,7 +104,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (14 (remainder disp #x800) RIGHT-SIGNED)))))))) (load-immediate - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword ((() (? offset) (? reg)) (VARIABLE-WIDTH (disp offset) @@ -128,7 +128,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (14 (remainder disp #x800) RIGHT-SIGNED)))))))) (left-immediate - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword ((() (? immed-21) (? reg)) (LONG (6 ,opcode) @@ -156,7 +156,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; cache instructions. (let-syntax ((indexed-load - (macro (keyword opcode extn) + (lambda (keyword opcode extn) `(define-instruction ,keyword (((? compl complx) (INDEX (? index-reg) (? space) (? base)) (? reg)) @@ -172,7 +172,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (5 reg)))))) (indexed-store - (macro (keyword opcode extn) + (lambda (keyword opcode extn) `(define-instruction ,keyword (((? compl complx) (? reg) (INDEX (? index-reg) (? space) (? base))) @@ -188,7 +188,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (5 reg)))))) (indexed-d-cache - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl m-val) (INDEX (? index-reg) (? space) (? base))) (LONG (6 #x01) @@ -200,7 +200,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (5 #x0)))))) (indexed-i-cache - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl m-val) (INDEX (? index-reg) (? space sr3) (? base))) @@ -229,7 +229,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (indexed-i-cache FICE #x0b)) (let-syntax ((scalr-short-load - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl compls) (OFFSET (? offset) (? space) (? base)) (? reg)) @@ -245,7 +245,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (5 reg)))))) (scalr-short-store - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl compls) (? reg) (OFFSET (? offset) (? space) (? base))) @@ -261,7 +261,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (5 offset RIGHT-SIGNED)))))) (float-short-load - (macro (keyword opcode extn) + (lambda (keyword opcode extn) `(define-instruction ,keyword (((? compl compls) (OFFSET (? offset) (? space) (? base)) (? reg)) @@ -277,7 +277,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (5 reg)))))) (float-short-store - (macro (keyword opcode extn) + (lambda (keyword opcode extn) `(define-instruction ,keyword (((? compl compls) (? reg) (OFFSET (? offset) (? space) (? base))) @@ -315,7 +315,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;;; They should be eventually (by using an LDIL,LDI,BLR sequence, for example). (let-syntax ((branch&link - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword ((() (? reg) (@PCR (? label))) (LONG (6 #x3a) @@ -354,7 +354,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (1 offset ASSEMBLE17:Z)))))) (branch - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword ((() (@PCR (? l))) (LONG (6 #x3a) @@ -397,7 +397,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (branch&link GATE 1)) (let-syntax ((BV&BLR - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword ((() (? offset-reg) (? reg)) (LONG (6 #x3a) @@ -418,7 +418,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (1 #b0)))))) (BE&BLE - (macro (keyword opcode) + (lambda (keyword opcode) `(define-instruction ,keyword ((() (OFFSET (? offset) (? space sr3) (? base))) (LONG (6 ,opcode) @@ -494,7 +494,7 @@ branch-extend-nullify in instr1. (let-syntax ((defccbranch - (macro (keyword completer opcode1 opcode2 opr1) + (lambda (keyword completer opcode1 opcode2 opr1) `(define-instruction ,keyword (((? compl ,completer) (? ,(car opr1)) (? reg-2) (@PCO (? offset))) (LONG (6 ,opcode1) @@ -596,7 +596,7 @@ Note: Only those currently used by the code generator are implemented. (let-syntax ((defccbranch - (macro (keyword completer opcode1 opcode2 opr1) + (lambda (keyword completer opcode1 opcode2 opr1) `(define-instruction ,keyword ;; No @PCO form. ;; This is a pseudo-instruction used by the code-generator @@ -667,7 +667,7 @@ Note: Only those currently used by the code generator are implemented. (let-syntax ((defmovb&bb - (macro (name opcode opr1 opr2 field2) + (lambda (name opcode opr1 opr2 field2) `(define-instruction ,name (((? compl compledb) (? ,(car opr1)) ,@opr2 (@PCO (? offset))) (LONG (6 ,opcode) diff --git a/v7/src/compiler/machines/spectrum/instr3.scm b/v7/src/compiler/machines/spectrum/instr3.scm index a9be62db3..4f4d10919 100644 --- a/v7/src/compiler/machines/spectrum/instr3.scm +++ b/v7/src/compiler/machines/spectrum/instr3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: instr3.scm,v 1.3 1999/01/02 06:06:43 cph Exp $ +$Id: instr3.scm,v 1.4 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987, 1989, 1990, 1999 Massachusetts Institute of Technology +Copyright (c) 1987, 1989, 1990, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; HP Spectrum Instruction Set Description @@ -27,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Computation instructions (let-syntax ((arith-logical - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl complal) (? source-reg1) (? source-reg2) (? target-reg)) @@ -103,7 +104,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (5 #b00000)))) (let-syntax ((immed-arith - (macro (keyword opcode extn) + (lambda (keyword opcode extn) `(define-instruction ,keyword (((? compl complal) (? immed-11) (? source-reg) (? target-reg)) @@ -144,7 +145,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (5 (- 31 pos)) (5 target-reg)))) -(let-syntax ((extr (macro (keyword extn) +(let-syntax ((extr (lambda (keyword extn) `(define-instruction ,keyword (((? compl compled) (? source-reg) (? pos) (? len) (? target-reg)) @@ -155,7 +156,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (3 ,extn) (5 pos) (5 (- 32 len))))))) - (vextr (macro (keyword extn) + (vextr (lambda (keyword extn) `(define-instruction ,keyword (((? compl compled) (? source-reg) (? len) (? target-reg)) @@ -172,7 +173,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (vextr VEXTRS 5)) (let-syntax ((depos - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl compled) (? source-reg) (? pos) (? len) (? target-reg)) @@ -184,7 +185,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (5 (- 31 pos)) (5 (- 32 len))))))) (vdepos - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl compled) (? source-reg) (? len) (? target-reg)) @@ -196,7 +197,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (5 #b00000) (5 (- 32 len))))))) (idepos - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl compled) (? immed) (? pos) (? len) (? target-reg)) @@ -209,7 +210,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (5 (- 32 len))))))) (videpos - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword (((? compl compled) (? immed) (? len) (? target-reg)) @@ -231,7 +232,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (vdepos ZVDEP 0)) (let-syntax ((Probe-Read-Write - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword ((() (OFFSET 0 (? space) (? base)) (? priv-reg) (? target-reg)) @@ -332,7 +333,7 @@ DIAG |# (let-syntax ((floatarith-1 - (macro (keyword extn-a extn-b) + (lambda (keyword extn-a extn-b) `(define-instruction ,keyword ((((? fmt fpformat)) (? source-reg) (? target-reg)) (LONG (6 #x0c) @@ -344,7 +345,7 @@ DIAG (4 #b0000) (5 target-reg)))))) (floatarith-2 - (macro (keyword extn-a extn-b) + (lambda (keyword extn-a extn-b) `(define-instruction ,keyword ((((? fmt fpformat)) (? source-reg1) (? source-reg2) (? target-reg)) @@ -378,7 +379,7 @@ DIAG (5 condition)))) (let-syntax ((fpconvert - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword ((((? sf fpformat) (? df fpformat)) (? source-reg1) @@ -409,7 +410,7 @@ DIAG ;; tested before use. WLH 11/18/86 (let-syntax ((multdiv - (macro (keyword extn) + (lambda (keyword extn) `(define-instruction ,keyword ((() (? reg-1) (? reg-2)) (LONG (6 #x04) @@ -439,7 +440,7 @@ DIAG (16 #b1000000000000000)))) (let-syntax ((multdivresult - (macro (keyword extn-a extn-b) + (lambda (keyword extn-a extn-b) `(define-instruction ,keyword ((() (? reg-t)) (LONG (6 #x04) diff --git a/v7/src/compiler/machines/spectrum/lapgen.scm b/v7/src/compiler/machines/spectrum/lapgen.scm index a97ee728a..3f3b3d2a4 100644 --- a/v7/src/compiler/machines/spectrum/lapgen.scm +++ b/v7/src/compiler/machines/spectrum/lapgen.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: lapgen.scm,v 4.48 1999/01/02 06:06:43 cph Exp $ +$Id: lapgen.scm,v 4.49 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; RTL Rules for HPPA. Shared utilities. @@ -591,7 +592,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Codes and Hooks (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() @@ -628,7 +629,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (LDI () ,code 28))) (let-syntax ((define-hooks - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() diff --git a/v7/src/compiler/machines/spectrum/rules3.scm b/v7/src/compiler/machines/spectrum/rules3.scm index dcc856e89..5596b2691 100644 --- a/v7/src/compiler/machines/spectrum/rules3.scm +++ b/v7/src/compiler/machines/spectrum/rules3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rules3.scm,v 4.42 1999/01/02 06:06:43 cph Exp $ +$Id: rules3.scm,v 4.43 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1988-1999 Massachusetts Institute of Technology +Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Invocations and Entries @@ -169,7 +170,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-special-primitive-invocation - (macro (name) + (lambda (name) `(define-rule statement (INVOCATION:SPECIAL-PRIMITIVE (? frame-size) @@ -180,7 +181,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ,(symbol-append 'CODE:COMPILER- name))))) (define-optimized-primitive-invocation - (macro (name) + (lambda (name) `(define-rule statement (INVOCATION:SPECIAL-PRIMITIVE (? frame-size) @@ -191,7 +192,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ,(symbol-append 'HOOK:COMPILER- name))))) (define-allocation-primitive - (macro (name) + (lambda (name) (let ((prim (make-primitive-procedure name true))) `(define-rule statement (INVOCATION:SPECIAL-PRIMITIVE diff --git a/v7/src/compiler/machines/spectrum/rulfix.scm b/v7/src/compiler/machines/spectrum/rulfix.scm index 6984a6e8d..e38171462 100644 --- a/v7/src/compiler/machines/spectrum/rulfix.scm +++ b/v7/src/compiler/machines/spectrum/rulfix.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rulfix.scm,v 4.48 1999/01/02 06:06:43 cph Exp $ +$Id: rulfix.scm,v 4.49 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1989-1999 Massachusetts Institute of Technology +Copyright (c) 1989-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Fixnum Rules @@ -188,7 +189,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((unary-fixnum - (macro (name instr nsv fixed-operand) + (lambda (name instr nsv fixed-operand) `(define-arithmetic-method ',name fixnum-methods/1-arg (lambda (tgt src overflow?) (if overflow? @@ -196,7 +197,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (LAP (,instr () ,fixed-operand ,',src ,',tgt))))))) (binary-fixnum - (macro (name instr nsv) + (lambda (name instr nsv) `(define-arithmetic-method ',name fixnum-methods/2-args (lambda (tgt src1 src2 overflow?) (if overflow? @@ -204,7 +205,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (LAP (,instr () ,',src1 ,',src2 ,',tgt))))))) (binary-out-of-line - (macro (name . regs) + (lambda (name . regs) `(define-arithmetic-method ',name fixnum-methods/2-args/special (cons ,(symbol-append 'HOOK:COMPILER- name) (lambda () diff --git a/v7/src/compiler/machines/spectrum/rulflo.scm b/v7/src/compiler/machines/spectrum/rulflo.scm index bbae6b70c..0f96231bb 100644 --- a/v7/src/compiler/machines/spectrum/rulflo.scm +++ b/v7/src/compiler/machines/spectrum/rulflo.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rulflo.scm,v 4.40 1999/01/02 06:06:43 cph Exp $ +$Id: rulflo.scm,v 4.41 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1989-1999 Massachusetts Institute of Technology +Copyright (c) 1989-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Flonum rules @@ -360,7 +361,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/1-arg (lambda (target source) (LAP (,opcode (DBL) ,',source ,',target))))))) @@ -386,7 +387,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (list 'FLONUM-METHODS/1-ARG/SPECIAL)) (let-syntax ((define-out-of-line - (macro (name) + (lambda (name) `(define-arithmetic-method ',name flonum-methods/1-arg/special ,(symbol-append 'HOOK:COMPILER- name))))) (define-out-of-line FLONUM-SIN) @@ -474,7 +475,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-flonum-operation - (macro (primitive-name opcode) + (lambda (primitive-name opcode) `(define-arithmetic-method ',primitive-name flonum-methods/2-args (lambda (target source1 source2) (LAP (,opcode (DBL) ,',source1 ,',source2 ,',target))))))) diff --git a/v7/src/compiler/machines/vax/assmd.scm b/v7/src/compiler/machines/vax/assmd.scm index 23f5cd2a7..c99c53c0d 100644 --- a/v7/src/compiler/machines/vax/assmd.scm +++ b/v7/src/compiler/machines/vax/assmd.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Id: assmd.scm,v 4.7 1999/01/02 06:06:43 cph Exp $ -$MC68020-Header: assmd.scm,v 1.36 89/08/28 18:33:33 GMT cph Exp $ +$Id: assmd.scm,v 4.8 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987, 1989, 1991, 1999 Massachusetts Institute of Technology +Copyright (c) 1987, 1989, 1991, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,14 +16,15 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; Assembler Machine Dependencies. DEC Vax version (declare (usual-integrations)) -(let-syntax ((ucode-type (macro (name) `',(microcode-type name)))) +(let-syntax ((ucode-type (lambda (name) `',(microcode-type name)))) (define-integrable maximum-padding-length ;; Instructions can be any number of bytes long. diff --git a/v7/src/compiler/machines/vax/dassm1.scm b/v7/src/compiler/machines/vax/dassm1.scm index f3ca79aad..2812d1ef9 100644 --- a/v7/src/compiler/machines/vax/dassm1.scm +++ b/v7/src/compiler/machines/vax/dassm1.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Id: dassm1.scm,v 4.7 1999/01/02 06:06:43 cph Exp $ -$MC68020-Header: dassm1.scm,v 4.15 90/07/12 16:42:39 GMT jinx Exp $ +$Id: dassm1.scm,v 4.8 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; VAX Disassembler: User level @@ -123,7 +123,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (cond ((not (< index end)) 'DONE) ((object-type? (let-syntax ((ucode-type - (macro (name) (microcode-type name)))) + (lambda (name) (microcode-type name)))) (ucode-type linkage-section)) (system-vector-ref block index)) (loop (disassembler/write-linkage-section block diff --git a/v7/src/compiler/machines/vax/dassm2.scm b/v7/src/compiler/machines/vax/dassm2.scm index f62080d32..452f19ad1 100644 --- a/v7/src/compiler/machines/vax/dassm2.scm +++ b/v7/src/compiler/machines/vax/dassm2.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: dassm2.scm,v 4.13 1999/01/02 06:06:43 cph Exp $ +$Id: dassm2.scm,v 4.14 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; VAX Disassembler: Top Level @@ -26,9 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define (disassembler/read-variable-cache block index) (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type quad) @@ -186,9 +187,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (with-absolutely-no-interrupts (lambda () (let-syntax ((ucode-type - (macro (name) (microcode-type name))) + (lambda (name) (microcode-type name))) (ucode-primitive - (macro (name arity) + (lambda (name arity) (make-primitive-procedure name arity)))) ((ucode-primitive primitive-object-set-type 2) (ucode-type compiled-entry) diff --git a/v7/src/compiler/machines/vax/instr2.scm b/v7/src/compiler/machines/vax/instr2.scm index 0aa5119d3..c33b5e985 100644 --- a/v7/src/compiler/machines/vax/instr2.scm +++ b/v7/src/compiler/machines/vax/instr2.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: instr2.scm,v 1.7 2001/12/20 20:51:16 cph Exp $ +$Id: instr2.scm,v 1.8 2001/12/20 21:45:25 cph Exp $ Copyright (c) 1987, 1989, 1999, 2001 Massachusetts Institute of Technology @@ -336,7 +336,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-arithmetic - (macro (name digit) + (lambda (name digit) `(define-instruction ,name ((B (? op ea-r-b) (? res ea-m-b)) (BYTE (8 ,(+ #x80 digit))) @@ -535,7 +535,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-bitwise - (macro (name opcode) + (lambda (name opcode) `(define-instruction ,name ((B (? mask ea-r-b) (? dst ea-m-b)) (BYTE (8 ,(+ #x80 opcode))) diff --git a/v7/src/compiler/machines/vax/instr3.scm b/v7/src/compiler/machines/vax/instr3.scm index fde83baa6..7aec89d30 100644 --- a/v7/src/compiler/machines/vax/instr3.scm +++ b/v7/src/compiler/machines/vax/instr3.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: instr3.scm,v 1.11 2001/12/20 20:51:16 cph Exp $ +$Id: instr3.scm,v 1.12 2001/12/20 21:45:25 cph Exp $ Copyright (c) 1987, 1989, 1991, 1999, 2001 Massachusetts Institute of Technology @@ -240,7 +240,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-field-instruction - (macro (name suffix1 suffix2 opcode mode) + (lambda (name suffix1 suffix2 opcode mode) `(define-instruction ,name ((,suffix1 (? pos ea-r-l) (? size ea-r-b) (? base ea-v-b) (? dst ,mode)) @@ -336,7 +336,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-unconditional-transfer - (macro (nameb namej bit) + (lambda (nameb namej bit) `(begin (define-instruction ,nameb ((B (@PCO (? dest))) @@ -708,7 +708,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-add/sub-bcd-instruction - (macro (name opcode4) + (lambda (name opcode4) `(define-instruction ,name (((? oplen ea-r-w) (? op ea-a-b) (? reslen ea-r-w) (? res ea-a-b)) @@ -734,7 +734,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-add/sub-bcd-instruction - (macro (name opcode) + (lambda (name opcode) `(define-instruction ,name (((? op1len ea-r-w) (? op1 ea-a-b) (? op2len ea-r-w) (? op2 ea-a-b) @@ -798,7 +798,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-cvt-trailing-instruction - (macro (name opcode) + (lambda (name opcode) `(define-instruction ,name (((? srclen ea-r-w) (? src ea-a-b) (? tbl ea-a-b) @@ -815,7 +815,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (let-syntax ((define-cvt-separate-instruction - (macro (name opcode) + (lambda (name opcode) `(define-instruction ,name (((? srclen ea-r-w) (? src ea-a-b) (? dstlen ea-r-w) (? dst ea-a-b)) diff --git a/v7/src/compiler/machines/vax/lapgen.scm b/v7/src/compiler/machines/vax/lapgen.scm index c188e6fbe..4f209782f 100644 --- a/v7/src/compiler/machines/vax/lapgen.scm +++ b/v7/src/compiler/machines/vax/lapgen.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: lapgen.scm,v 4.16 1999/01/02 06:06:43 cph Exp $ +$Id: lapgen.scm,v 4.17 2001/12/20 21:45:25 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; RTL Rules for DEC VAX. @@ -534,7 +535,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (define-integrable reg:stack-guard (INST-EA (@RO B 10 #x002C))) (let-syntax ((define-codes - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() @@ -556,7 +557,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. set! define lookup-apply)) (let-syntax ((define-entries - (macro (start . names) + (lambda (start . names) (define (loop names index) (if (null? names) '() diff --git a/v7/src/compiler/machines/vax/rules3.scm b/v7/src/compiler/machines/vax/rules3.scm index d7559a732..55be738a3 100644 --- a/v7/src/compiler/machines/vax/rules3.scm +++ b/v7/src/compiler/machines/vax/rules3.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rules3.scm,v 4.12 1999/01/02 06:06:43 cph Exp $ +$Id: rules3.scm,v 4.13 2001/12/20 21:45:26 cph Exp $ -Copyright (c) 1987-1999 Massachusetts Institute of Technology +Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Invocations and Entries. @@ -163,7 +164,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-special-primitive-invocation - (macro (name) + (lambda (name) `(define-rule statement (INVOCATION:SPECIAL-PRIMITIVE (? frame-size) diff --git a/v7/src/compiler/machines/vax/rulfix.scm b/v7/src/compiler/machines/vax/rulfix.scm index 825d0ff8d..14d637022 100644 --- a/v7/src/compiler/machines/vax/rulfix.scm +++ b/v7/src/compiler/machines/vax/rulfix.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Id: rulfix.scm,v 1.6 1999/01/02 06:06:43 cph Exp $ -$MC68020-Header: rules1.scm,v 4.34 1991/01/23 21:34:30 jinx Exp $ +$Id: rulfix.scm,v 1.7 2001/12/20 21:45:26 cph Exp $ -Copyright (c) 1989, 1991, 1999 Massachusetts Institute of Technology +Copyright (c) 1989, 1991, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; LAP Generation Rules: Fixnum operations. @@ -547,7 +547,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((binary/commutative - (macro (name instr eql) + (lambda (name instr eql) `(define-fixnum-method ',name fixnum-methods/2-args (lambda (target source1 source2) (if (ea/same? source1 source2) @@ -564,7 +564,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ,',target))))))))) (binary/noncommutative - (macro (name instr) + (lambda (name instr) `(define-fixnum-method ',name fixnum-methods/2-args (lambda (target source1 source2) (cond ((ea/same? source1 source2) @@ -692,7 +692,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((binary-fixnum/constant - (macro (name instr null ->constant identity?) + (lambda (name instr null ->constant identity?) `(define-fixnum-method ',name fixnum-methods/2-args-constant (lambda (target source n) (cond ((eqv? n ,null) diff --git a/v7/src/compiler/rtlbase/rtlreg.scm b/v7/src/compiler/rtlbase/rtlreg.scm index 49baeac41..e1806ee6a 100644 --- a/v7/src/compiler/rtlbase/rtlreg.scm +++ b/v7/src/compiler/rtlbase/rtlreg.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: rtlreg.scm,v 4.6 1999/01/02 06:06:43 cph Exp $ +$Id: rtlreg.scm,v 4.7 2001/12/20 21:45:26 cph Exp $ -Copyright (c) 1987, 1988, 1990, 1999 Massachusetts Institute of Technology +Copyright (c) 1987, 1988, 1990, 1999, 2001 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. |# ;;;; RTL Registers @@ -66,7 +67,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (let-syntax ((define-register-references - (macro (slot) + (lambda (slot) (let ((name (symbol-append 'REGISTER- slot))) (let ((vector `(,(symbol-append 'RGRAPH- name) *CURRENT-RGRAPH*))) `(BEGIN (DEFINE-INTEGRABLE (,name REGISTER) -- 2.25.1