This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
committed: have opcodes CGEN script load guile.scm explicitly
- From: Jim Blandy <jimb at redhat dot com>
- To: binutils at sources dot redhat dot com
- Date: 08 Feb 2005 12:48:24 -0500
- Subject: committed: have opcodes CGEN script load guile.scm explicitly
I've committed the patch below, with the assent of the CGEN folks. It
touches some opcodes files, so I thought I should post it here as well.
cgen/ChangeLog:
2005-02-07 Jim Blandy <jimb@redhat.com>
* cgen-opc.scm: Don't load fixup.scm here. (See corresponding
changes in the opcodes directory.)
opcodes/ChangeLog:
2005-02-07 Jim Blandy <jimb@redhat.com>
* Makefile.am (CGEN): Load guile.scm before calling the main
application script.
* Makefile.in: Regenerated.
* cgen.sh: Be prepared for the 'cgen' argument to contain spaces.
Simply pass the cgen-opc.scm path to ${cgen} as its first
argument; ${cgen} itself now contains the '-s', or whatever is
appropriate for the Scheme being used.
Index: cgen/cgen-opc.scm
===================================================================
RCS file: /cvs/src/src/cgen/cgen-opc.scm,v
retrieving revision 1.2
diff -c -p -r1.2 cgen-opc.scm
*** cgen/cgen-opc.scm 8 Sep 2003 17:17:22 -0000 1.2
--- cgen/cgen-opc.scm 8 Feb 2005 04:47:54 -0000
***************
*** 10,18 ****
; 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"))
--- 10,15 ----
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.79
diff -c -p -r1.79 Makefile.am
*** opcodes/Makefile.am 27 Nov 2004 11:09:20 -0000 1.79
--- opcodes/Makefile.am 8 Feb 2005 04:47:55 -0000
*************** CLEANFILES = \
*** 357,363 ****
CGENDIR = @cgendir@
CPUDIR = $(CGENDIR)/cpu
! CGEN = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
CGENFLAGS = -v
CGENDEPS = \
--- 357,363 ----
CGENDIR = @cgendir@
CPUDIR = $(CGENDIR)/cpu
! CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s"
CGENFLAGS = -v
CGENDEPS = \
Index: opcodes/Makefile.in
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.in,v
retrieving revision 1.89
diff -c -p -r1.89 Makefile.in
*** opcodes/Makefile.in 27 Nov 2004 11:09:20 -0000 1.89
--- opcodes/Makefile.in 8 Feb 2005 04:47:55 -0000
*************** CLEANFILES = \
*** 532,538 ****
CGENDIR = @cgendir@
CPUDIR = $(CGENDIR)/cpu
! CGEN = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
CGENFLAGS = -v
CGENDEPS = \
$(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm \
--- 532,538 ----
CGENDIR = @cgendir@
CPUDIR = $(CGENDIR)/cpu
! CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s"
CGENFLAGS = -v
CGENDEPS = \
$(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm \
Index: opcodes/cgen.sh
===================================================================
RCS file: /cvs/src/src/opcodes/cgen.sh,v
retrieving revision 1.3
diff -c -p -r1.3 cgen.sh
*** opcodes/cgen.sh 8 Sep 2003 17:24:05 -0000 1.3
--- opcodes/cgen.sh 8 Feb 2005 04:47:55 -0000
*************** set -e
*** 47,53 ****
action=$1
srcdir=$2
! cgen=$3
cgendir=$4
cgenflags=$5
arch=$6
--- 47,53 ----
action=$1
srcdir=$2
! cgen="$3"
cgendir=$4
cgenflags=$5
arch=$6
*************** opcodes)
*** 93,99 ****
rm -f tmp-dis.c tmp-dis.in1
# Run CGEN.
! ${cgen} -s ${cgendir}/cgen-opc.scm \
-s ${cgendir} \
${cgenflags} \
-f "${options}" \
--- 93,99 ----
rm -f tmp-dis.c tmp-dis.in1
# Run CGEN.
! ${cgen} ${cgendir}/cgen-opc.scm \
-s ${cgendir} \
${cgenflags} \
-f "${options}" \