From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5204 invoked by alias); 15 Feb 2005 09:02:29 -0000 Mailing-List: contact cgen-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cgen-owner@sources.redhat.com Received: (qmail 4782 invoked from network); 15 Feb 2005 09:00:43 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 15 Feb 2005 09:00:43 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id j1F90h9I020696 for ; Tue, 15 Feb 2005 04:00:43 -0500 Received: from zenia.home.redhat.com (sebastian-int.corp.redhat.com [172.16.52.221]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id j1F90gO15291; Tue, 15 Feb 2005 04:00:42 -0500 To: cgen@sources.redhat.com Subject: commit: remove last uses of fixup.scm From: Jim Blandy Date: Tue, 15 Feb 2005 09:02:00 -0000 Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2005-q1/txt/msg00030.txt.bz2 2005-02-15 Jim Blandy * Makefile.am (GUILE): Explicitly load guile.scm here, and leave a trailing -s. (desc, html, opcodes, sim-arch, sim-cpu, gas-test, sim-test): Don't write out the trailing -s here. * Makefile.in: Regenerated. * cgen-doc.scm, cgen-gas.scm, cgen-stest.scm): Don't load fixup.scm here; let the caller decide which Scheme's customization file to preload. * dev.scm: Load guile.scm, not fixup.scm. * fixup.scm: Deleted; contents have all moved to guile.scm. * README: Doc fix. Index: cgen/Makefile.am =================================================================== RCS file: /cvs/src/src/cgen/Makefile.am,v retrieving revision 1.4 diff -c -p -r1.4 Makefile.am *** cgen/Makefile.am 11 Sep 2003 19:14:37 -0000 1.4 --- cgen/Makefile.am 15 Feb 2005 08:34:08 -0000 *************** AUTOMAKE_OPTIONS = cygnus *** 4,10 **** SUBDIRS = doc ! GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` CGENFLAGS = -v ARCH = @arch@ ARCHFILE = $(srcroot)/../cpu/$(ARCH).cpu --- 4,10 ---- SUBDIRS = doc ! GUILE = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l guile -s" CGENFLAGS = -v ARCH = @arch@ ARCHFILE = $(srcroot)/../cpu/$(ARCH).cpu *************** stamp-cgen: $(CGENFILES) *** 46,52 **** # FIXME: needs more dependencies desc: desc.scm rm -f tmp-desc.h tmp-desc.c tmp-opinst.c ! $(GUILE) -s $(srcdir)/cgen-opc.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS)" \ --- 46,52 ---- # FIXME: needs more dependencies desc: desc.scm rm -f tmp-desc.h tmp-desc.c tmp-opinst.c ! $(GUILE) $(srcdir)/cgen-opc.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS)" \ *************** desc: desc.scm *** 60,66 **** .PHONY: html html: desc.scm html.scm cgen-doc.scm rm -f tmp-doc.html ! $(GUILE) -s $(srcdir)/cgen-doc.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS)" \ --- 60,66 ---- .PHONY: html html: desc.scm html.scm cgen-doc.scm rm -f tmp-doc.html ! $(GUILE) $(srcdir)/cgen-doc.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS)" \ *************** html: desc.scm html.scm cgen-doc.scm *** 82,88 **** opcodes: opcodes.scm rm -f tmp-opc.h tmp-itab.c rm -f tmp-asm.in tmp-dis.in tmp-ibld.h tmp-ibld.in ! $(GUILE) -s $(srcdir)/cgen-opc.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS) opinst" \ --- 82,88 ---- opcodes: opcodes.scm rm -f tmp-opc.h tmp-itab.c rm -f tmp-asm.in tmp-dis.in tmp-ibld.h tmp-ibld.in ! $(GUILE) $(srcdir)/cgen-opc.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS) opinst" \ *************** opcodes: opcodes.scm *** 103,109 **** # FIXME: needs more dependencies sim-arch: sim.scm rm -f tmp-arch.h tmp-arch.c tmp-cpuall.h ! $(GUILE) -s $(srcdir)/cgen-sim.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS)" \ --- 103,109 ---- # FIXME: needs more dependencies sim-arch: sim.scm rm -f tmp-arch.h tmp-arch.c tmp-cpuall.h ! $(GUILE) $(srcdir)/cgen-sim.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS)" \ *************** sim-arch: sim.scm *** 114,120 **** sim-cpu: sim.scm rm -f tmp-cpu.h tmp-cpu.c tmp-decode.h tmp-decode.c rm -f tmp-model.c tmp-sem.c tmp-sem-switch.c ! $(GUILE) -s $(srcdir)/cgen-sim.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS)" \ --- 114,120 ---- sim-cpu: sim.scm rm -f tmp-cpu.h tmp-cpu.c tmp-decode.h tmp-decode.c rm -f tmp-model.c tmp-sem.c tmp-sem-switch.c ! $(GUILE) $(srcdir)/cgen-sim.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -f "$(OPTIONS)" \ *************** gas-test: gas-test.scm cgen-gas.scm *** 135,141 **** echo "ISAS not specified!" ;\ exit 1 ;\ fi ! $(GUILE) -s $(srcdir)/cgen-gas.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -a $(ARCHFILE) \ --- 135,141 ---- echo "ISAS not specified!" ;\ exit 1 ;\ fi ! $(GUILE) $(srcdir)/cgen-gas.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -a $(ARCHFILE) \ *************** sim-test: sim-test.scm cgen-stest.scm *** 153,159 **** echo "ISAS not specified!" ;\ exit 1 ;\ fi ! $(GUILE) -s $(srcdir)/cgen-stest.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -a $(ARCHFILE) \ --- 153,159 ---- echo "ISAS not specified!" ;\ exit 1 ;\ fi ! $(GUILE) $(srcdir)/cgen-stest.scm \ -s $(srcdir) \ $(CGENFLAGS) \ -a $(ARCHFILE) \ Index: cgen/README =================================================================== RCS file: /cvs/src/src/cgen/README,v retrieving revision 1.7 diff -c -p -r1.7 README *** cgen/README 5 Jul 2001 12:45:46 -0000 1.7 --- cgen/README 15 Feb 2005 08:34:08 -0000 *************** misc. support scripts *** 166,173 **** --------------------- dev.scm - top level script for doing interactive development ! fixup.scm - munges the Scheme environment to make it suit us ! [Guile is/was still in flux] cos.scm - OOP implementation pmacros.scm - preprocessor-style macro package profile.scm - Guile profiling tool [eventually wish to move this to --- 166,173 ---- --------------------- dev.scm - top level script for doing interactive development ! guile.scm - Guile-specific definitions, and adaptations to specific ! versions of Guile cos.scm - OOP implementation pmacros.scm - preprocessor-style macro package profile.scm - Guile profiling tool [eventually wish to move this to Index: cgen/cgen-doc.scm =================================================================== RCS file: /cvs/src/src/cgen/cgen-doc.scm,v retrieving revision 1.3 diff -c -p -r1.3 cgen-doc.scm *** cgen/cgen-doc.scm 8 Sep 2003 17:17:22 -0000 1.3 --- cgen/cgen-doc.scm 15 Feb 2005 08:34:08 -0000 *************** *** 9,17 **** ; Load the various support routines. (define (load-files srcdir) - ; Fix up Scheme to be what we use (guile is always in flux). - (primitive-load-path (string-append srcdir "/fixup.scm")) - (load (string-append srcdir "/read.scm")) (load (string-append srcdir "/desc.scm")) (load (string-append srcdir "/desc-cpu.scm")) --- 9,14 ---- Index: cgen/cgen-gas.scm =================================================================== RCS file: /cvs/src/src/cgen/cgen-gas.scm,v retrieving revision 1.3 diff -c -p -r1.3 cgen-gas.scm *** cgen/cgen-gas.scm 8 Sep 2003 17:17:22 -0000 1.3 --- cgen/cgen-gas.scm 15 Feb 2005 08:34:08 -0000 *************** *** 8,16 **** ; Load the various support routines. (define (load-files srcdir) - ; Fix up Scheme to be what we use (guile is always in flux). - (primitive-load-path (string-append srcdir "/fixup.scm")) - (load (string-append srcdir "/read.scm")) (load (string-append srcdir "/desc.scm")) (load (string-append srcdir "/desc-cpu.scm")) --- 8,13 ---- Index: cgen/cgen-stest.scm =================================================================== RCS file: /cvs/src/src/cgen/cgen-stest.scm,v retrieving revision 1.2 diff -c -p -r1.2 cgen-stest.scm *** cgen/cgen-stest.scm 8 Sep 2003 17:17:22 -0000 1.2 --- cgen/cgen-stest.scm 15 Feb 2005 08:34:08 -0000 *************** *** 8,16 **** ; Load the various support routines (define (load-files srcdir) - ; Fix up Scheme to be what we use (guile is always in flux). - (primitive-load-path (string-append srcdir "/fixup.scm")) - (load (string-append srcdir "/read.scm")) (load (string-append srcdir "/desc.scm")) (load (string-append srcdir "/desc-cpu.scm")) --- 8,13 ---- Index: cgen/dev.scm =================================================================== RCS file: /cvs/src/src/cgen/dev.scm,v retrieving revision 1.7 diff -c -p -r1.7 dev.scm *** cgen/dev.scm 10 Jun 2003 21:22:02 -0000 1.7 --- cgen/dev.scm 15 Feb 2005 08:34:08 -0000 *************** *** 12,20 **** ; (load-sid) ; (cload #:arch arch #:machs "mach-list" #:isas "isa-list" #:options "options") ! ; First load fixup.scm to coerce guile into something we've been using. ; Guile is always in flux. ! (load "fixup.scm") (define srcdir ".") (set! %load-path (cons srcdir %load-path)) --- 12,20 ---- ; (load-sid) ; (cload #:arch arch #:machs "mach-list" #:isas "isa-list" #:options "options") ! ; First load guile.scm to coerce guile into something we've been using. ; Guile is always in flux. ! (load "guile.scm") (define srcdir ".") (set! %load-path (cons srcdir %load-path)) Index: cgen/fixup.scm =================================================================== RCS file: cgen/fixup.scm diff -N cgen/fixup.scm *** cgen/fixup.scm 16 Jul 2003 05:35:47 -0000 1.2 --- cgen/fixup.scm 1 Jan 1970 00:00:00 -0000 *************** *** 1,60 **** - ; Fix up the current interpreter-du-jour to conform to what we've - ; been working with. - ; Copyright (C) 2000 Red Hat, Inc. - ; This file is part of CGEN. - ; See file COPYING.CGEN for details. - - (define *guile-major-version* (string->number (major-version))) - (define *guile-minor-version* (string->number (minor-version))) - - ; eval takes a module argument in 1.6 and later - - (if (or (> *guile-major-version* 1) - (>= *guile-minor-version* 6)) - (define (eval1 expr) - (eval expr (current-module))) - (define (eval1 expr) - (eval expr)) - ) - - ; symbol-bound? is deprecated in 1.6 - - (if (or (> *guile-major-version* 1) - (>= *guile-minor-version* 6)) - (define (symbol-bound? table s) - (if table - (error "must pass #f for symbol-bound? first arg")) - ; FIXME: Not sure this is 100% correct. - (module-defined? (current-module) s)) - ) - - (if (symbol-bound? #f 'load-from-path) - (begin - (define (load file) - (begin - ;(load-from-path file) - (primitive-load-path file) - )) - ) - ) - - ; FIXME: to be deleted - (define =? =) - (define >=? >=) - - (if (not (symbol-bound? #f '%stat)) - (begin - (define %stat stat) - ) - ) - - (if (symbol-bound? #f 'debug-enable) - (debug-enable 'backtrace) - ) - - ; Guile 1.3 has reverse!, Guile 1.2 has list-reverse!. - ; CGEN uses reverse! - (if (and (not (symbol-bound? #f 'reverse!)) - (symbol-bound? #f 'list-reverse!)) - (define reverse! list-reverse!) - ) --- 0 ----