2006-05-10 Dave Brolley <brolley@redhat.com>

        * read.scm (-cgen): Add trailing "/" to arch-path.
        * utils.scm (dirname): Removed. dirname is a primitive function.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index f6e4e88..82c36ed 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-10  Dave Brolley  <brolley@redhat.com>
+
+       * read.scm (-cgen): Add trailing "/" to arch-path.
+       * utils.scm (dirname): Removed. dirname is a primitive function.
+
 2006-05-09  Dave Brolley  <brolley@redhat.com>
 
        * utils-sim.scm (-gen-decode-insn-entry): Generated code should shift

diff --git a/cgen/read.scm b/cgen/read.scm
index b1bddb1..b9ac1e3 100644 (file)
--- a/cgen/read.scm
+++ b/cgen/read.scm
@@ -1074,7 +1074,7 @@ Define a preprocessor-style macro.
              (else
               (cond ((str=? "-a" (car opt))
                      (set! arch-file arg)
-                     (set! arch-path (dirname arg))
+                     (set! arch-path (string-append (dirname arg) "/"))
                      )
                     ((str=? "-b" (car opt))
                      (set! debugging #t)

diff --git a/cgen/utils.scm b/cgen/utils.scm
index c79f374..f6ec33b 100644 (file)
--- a/cgen/utils.scm
+++ b/cgen/utils.scm
@@ -155,15 +155,6 @@
                   (->string str))
 )
 
-; Return the directory name of the given file name
-
-(define (dirname s)
-  (let loop ((i (string-length s)))
-    (cond ((= i 0) "")
-         ((char=? #\/ (string-ref s (- i 1))) (substring s 0 i))
-         (else (loop (- i 1)))))
-)
-
 ; Turn STR into lowercase.
 
 (define (string-downcase str)