This is the mail archive of the
cgen@sourceware.org
mailing list for the CGEN project.
[patch][commit] Location of (include file)
- From: Dave Brolley <brolley at redhat dot com>
- To: cgen at sources dot redhat dot com
- Date: Tue, 09 May 2006 12:23:34 -0400
- Subject: [patch][commit] Location of (include file)
Hi,
I've committed the attached patch. It causes cgen to look for included
files in the same directory as specified by the -a option (i.e. same as
the original input file). The previous behaviour was to look in
$srcdir/cgen/cpu which is obviously not correct when processing files
from $srcdir/cpu. If -a is not specified, then all files are obtained
form $srcdir/cgen/cpu (unchanged from before).
Let me know if there are any problems or concerns.
Dave
2006-05-09 Dave Brolley <brolley@redhat.com>
* read.scm (include): Use arch-path as file location.
(arch-path): Define it with a default setting.
(-cgen): Update arch-path when "-a" option is specified.
? cgen/string
Index: cgen/read.scm
===================================================================
RCS file: /cvs/src/src/cgen/read.scm,v
retrieving revision 1.11
diff -c -p -r1.11 read.scm
*** cgen/read.scm 15 Feb 2005 09:01:35 -0000 1.11
--- cgen/read.scm 9 May 2006 16:13:59 -0000
***************
*** 1,5 ****
; Top level file for reading and recording .cpu file contents.
! ; Copyright (C) 2000, 2001 Red Hat, Inc.
; This file is part of CGEN.
; See file COPYING.CGEN for details.
--- 1,5 ----
; Top level file for reading and recording .cpu file contents.
! ; Copyright (C) 2000, 2001, 2006 Red Hat, Inc.
; This file is part of CGEN.
; See file COPYING.CGEN for details.
*************** Define a preprocessor-style macro.
*** 781,788 ****
; .cpu file include mechanism
(define (include file)
! (logit 1 "Including file " file " ...\n")
! (reader-read-file! (string-append srcdir "/cpu/" file))
(logit 2 "Resuming previous file ...\n")
)
--- 781,788 ----
; .cpu file include mechanism
(define (include file)
! (logit 1 "Including file " (string-append arch-path file) " ...\n")
! (reader-read-file! (string-append arch-path file))
(logit 2 "Resuming previous file ...\n")
)
*************** Define a preprocessor-style macro.
*** 994,999 ****
--- 994,1001 ----
)
)
+ (define arch-path (string-append srcdir "/cpu/"))
+
; Accessors for application option specs
(define (opt-get-first-pass opt)
(or (list-ref opt 3) (lambda args #f)))
*************** Define a preprocessor-style macro.
*** 1072,1077 ****
--- 1074,1080 ----
(else
(cond ((str=? "-a" (car opt))
(set! arch-file arg)
+ (set! arch-path (dirname arg))
)
((str=? "-b" (car opt))
(set! debugging #t)