Use x86-64 pathnames for x86-64 back end's packaging and scripts.

diff --git a/src/compiler/machines/x86-64/compiler.cbf b/src/compiler/machines/x86-64/compiler.cbf
index 2fd6ec19562e45769ca03697a720b339e58b78d0..616ff44155354a0faa03044d3b7a77ee85b8f35a 100644 (file)
--- a/src/compiler/machines/x86-64/compiler.cbf
+++ b/src/compiler/machines/x86-64/compiler.cbf
@@ -31,7 +31,7 @@ USA.
              "base"
              "fggen"
              "fgopt"
-             "machines/i386"
+             "machines/x86-64"
              "rtlbase"
              "rtlgen"
              "rtlopt")))
\ No newline at end of file

diff --git a/src/compiler/machines/x86-64/compiler.pkg b/src/compiler/machines/x86-64/compiler.pkg
index 572de333f986be2986669de3ce8fa872c6bfeed8..9be5f12fb29b306dd134d3cc9ae9dd49b3381352 100644 (file)
--- a/src/compiler/machines/x86-64/compiler.pkg
+++ b/src/compiler/machines/x86-64/compiler.pkg
@@ -35,7 +35,7 @@ USA.
         "base/sets"                    ;set abstraction
         "base/mvalue"                  ;multiple-value support
         "base/scode"                   ;SCode abstraction
-        "machines/i386/machin"         ;machine dependent stuff
+        "machines/x86-64/machin"       ;machine dependent stuff
         "back/asutl"                   ;back-end odds and ends
         "base/utils"                   ;odds and ends
 
@@ -217,7 +217,7 @@ USA.
          rule-matcher))
 
 (define-package (compiler declarations)
-  (files "machines/i386/decls")
+  (files "machines/x86-64/decls")
   (parent (compiler))
   (export (compiler)
          sc
@@ -541,7 +541,7 @@ USA.
   (files "rtlgen/rtlgen"               ;RTL generator
         "rtlgen/rgstmt"                ;statements
         "rtlgen/fndvar"                ;find variables
-        "machines/i386/rgspcm"         ;special close-coded primitives
+        "machines/x86-64/rgspcm"       ;special close-coded primitives
         "rtlbase/rtline"               ;linearizer
         )
   (parent (compiler))
@@ -665,23 +665,24 @@ USA.
         "back/lapgn2"                  ; "      "
         "back/lapgn3"                  ; "      "
         "back/regmap"                  ;Hardware register allocator
-        "machines/i386/lapgen"         ;code generation rules
-        "machines/i386/rules1"         ;  "      "        "
-        "machines/i386/rules2"         ;  "      "        "
-        "machines/i386/rules3"         ;  "      "        "
-        "machines/i386/rules4"         ;  "      "        "
-        "machines/i386/rulfix"         ;  "      "        "
-        "machines/i386/rulflo"         ;  "      "        "
-        "machines/i386/rulrew"         ;code rewriting rules
+        "back/checks"                  ;Interrupt checks
+        "machines/x86-64/lapgen"       ;code generation rules
+        "machines/x86-64/rules1"       ;  "      "        "
+        "machines/x86-64/rules2"       ;  "      "        "
+        "machines/x86-64/rules3"       ;  "      "        "
+        "machines/x86-64/rules4"       ;  "      "        "
+        "machines/x86-64/rulfix"       ;  "      "        "
+        "machines/x86-64/rulflo"       ;  "      "        "
+        "machines/x86-64/rulrew"       ;code rewriting rules
         "back/syntax"                  ;Generic syntax phase
         "back/syerly"                  ;Early binding version
-        "machines/i386/coerce"         ;Coercions: integer -> bit string
+        "machines/x86-64/coerce"       ;Coercions: integer -> bit string
         "back/asmmac"                  ;Macros for hairy syntax
-        "machines/i386/insmac"         ;Macros for hairy syntax
-        "machines/i386/insutl"         ;i386 instruction utilities
-        "machines/i386/instr1"         ;i386 instructions
-        "machines/i386/instr2"         ;  "        "
-        "machines/i386/instrf"         ;i387/i486 fp instructions
+        "machines/x86-64/insmac"       ;Macros for hairy syntax
+        "machines/x86-64/insutl"       ;x86-64 instruction utilities
+        "machines/x86-64/instr1"       ;x86-64 instructions
+        "machines/x86-64/instr2"       ;  "        "
+        "machines/x86-64/instrf"       ;  "        " fp instructions
         )
   (parent (compiler))
   (export (compiler)
@@ -728,13 +729,13 @@ USA.
          linearize-lap))
 
 (define-package (compiler lap-optimizer)
-  (files "machines/i386/lapopt")
+  (files "machines/x86-64/lapopt")
   (parent (compiler))
   (export (compiler top-level)
          optimize-linear-lap))
 
 (define-package (compiler assembler)
-  (files "machines/i386/assmd"         ;Machine dependent
+  (files "machines/x86-64/assmd"       ;Machine dependent
         "back/symtab"                  ;Symbol tables
         "back/bitutl"                  ;Assembly blocks
         "back/bittop"                  ;Assembler top level
@@ -746,9 +747,9 @@ USA.
          assemble))
 
 (define-package (compiler disassembler)
-  (files "machines/i386/dassm1"
-        "machines/i386/dassm2"
-        "machines/i386/dassm3")
+  (files "machines/x86-64/dassm1"
+        "machines/x86-64/dassm2"
+        "machines/x86-64/dassm3")
   (parent (compiler))
   (export ()
          compiler:write-lap-file

diff --git a/src/compiler/machines/x86-64/compiler.sf b/src/compiler/machines/x86-64/compiler.sf
index 5380fa3ab2d95eb21014ef7a01b7f37ece32d868..1718ff6f777ebc56d4dab451a6d70e7e25cd5c75 100644 (file)
--- a/src/compiler/machines/x86-64/compiler.sf
+++ b/src/compiler/machines/x86-64/compiler.sf
@@ -51,22 +51,22 @@ USA.
       (newline)
       (sf-and-load '("base/switch") '(COMPILER))
       (sf-and-load '("base/macros") '(COMPILER MACROS))
-      (sf-and-load '("machines/i386/decls") '(COMPILER DECLARATIONS))
+      (sf-and-load '("machines/x86-64/decls") '(COMPILER DECLARATIONS))
       (let ((environment (->environment '(COMPILER DECLARATIONS))))
        (set! (access source-file-expression environment) "*.scm")
        ((access initialize-package! environment)))
       (sf-and-load '("base/pmlook") '(COMPILER PATTERN-MATCHER/LOOKUP))
       (sf-and-load '("base/pmpars") '(COMPILER PATTERN-MATCHER/PARSER))
-      (sf-and-load '("machines/i386/machin") '(COMPILER))
+      (sf-and-load '("machines/x86-64/machin") '(COMPILER))
       (fluid-let ((sf/default-declarations
                   '((integrate-external "insseq")
                     (integrate-external "machin")
                     (usual-definition (set expt)))))
-       (sf-and-load '("machines/i386/assmd") '(COMPILER ASSEMBLER)))
+       (sf-and-load '("machines/x86-64/assmd") '(COMPILER ASSEMBLER)))
       (sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
-      (sf-and-load '("machines/i386/coerce"
+      (sf-and-load '("machines/x86-64/coerce"
                     "back/asmmac"
-                    "machines/i386/insmac")
+                    "machines/x86-64/insmac")
                   '(COMPILER LAP-SYNTAXER))
       (sf-and-load '("base/scode") '(COMPILER))
       (sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))

diff --git a/src/compiler/machines/x86-64/decls.scm b/src/compiler/machines/x86-64/decls.scm
index 333617ecdd772322d731193df9c1da876598ea84..2a60c6caa92c7012fb6bbbad6f59f2549915e7a6 100644 (file)
--- a/src/compiler/machines/x86-64/decls.scm
+++ b/src/compiler/machines/x86-64/decls.scm
@@ -56,7 +56,7 @@ USA.
                                 "/"
                                 source-file-expression))))
          '("back" "base" "fggen" "fgopt" "rtlbase" "rtlgen" "rtlopt"
-                  "machines/i386"))))
+                  "machines/x86-64"))))
     (if (null? filenames)
        (error "Can't find source files of compiler"))
     (set! source-filenames filenames))
@@ -336,7 +336,7 @@ USA.
                              "asmmac" "bittop" "bitutl" "insseq" "lapgn1"
                              "lapgn2" "lapgn3" "linear" "regmap" "symtab"
                              "syntax")
-            (filename/append "machines/i386"
+            (filename/append "machines/x86-64"
                              "dassm1" "insmac" "lapopt" "machin" "rgspcm"
                              "rulrew")
             (filename/append "fggen"
@@ -359,7 +359,7 @@ USA.
                              "rerite" "rinvex" "rlife" "rtlcsm"))
      (->environment '(COMPILER)))
     (file-dependency/syntax/join
-     (filename/append "machines/i386"
+     (filename/append "machines/x86-64"
                      "lapgen"
                      "rules1" "rules2" "rules3" "rules4" "rulfix" "rulflo"
                      "insutl" "instr1" "instr2" "instrf")
@@ -384,8 +384,8 @@ USA.
                           "contin" "ctypes" "enumer" "lvalue"
                           "object" "proced" "rvalue"
                           "scode" "subprb" "utils"))
-        (i386-base
-         (append (filename/append "machines/i386" "machin")
+        (x86-64-base
+         (append (filename/append "machines/x86-64" "machin")
                  (filename/append "back" "asutl")))
         (rtl-base
          (filename/append "rtlbase"
@@ -399,23 +399,23 @@ USA.
                                   "rcse2" "rcseep")
                  cse-base))
         (instruction-base
-         (filename/append "machines/i386" "assmd" "machin"))
+         (filename/append "machines/x86-64" "assmd" "machin"))
         (lapgen-base
          (append (filename/append "back" "linear" "regmap")
-                 (filename/append "machines/i386" "lapgen")))
+                 (filename/append "machines/x86-64" "lapgen")))
         (assembler-base
          (append (filename/append "back" "symtab")
-                 (filename/append "machines/i386" "insutl")))
+                 (filename/append "machines/x86-64" "insutl")))
         (lapgen-body
          (append
           (filename/append "back" "lapgn1" "lapgn2" "syntax")
-          (filename/append "machines/i386"
+          (filename/append "machines/x86-64"
                            "rules1" "rules2" "rules3" "rules4"
                            "rulfix" "rulflo")))
         (assembler-body
          (append
           (filename/append "back" "bittop")
-          (filename/append "machines/i386"
+          (filename/append "machines/x86-64"
                            "instr1" "instr2" "instrf"))))
 
     (define (file-dependency/integration/join filenames dependencies)
@@ -436,7 +436,7 @@ USA.
        (string-append directory "/" name)
        (apply filename/append directory* names)))
 
-    (define-integration-dependencies "machines/i386" "machin" "back" "asutl")
+    (define-integration-dependencies "machines/x86-64" "machin" "back" "asutl")
     (define-integration-dependencies "base" "object" "base" "enumer")
     (define-integration-dependencies "base" "enumer" "base" "object")
     (define-integration-dependencies "base" "cfg1" "base" "object")
@@ -459,16 +459,16 @@ USA.
     (define-integration-dependencies "base" "subprb" "base"
       "cfg3" "contin" "enumer" "object" "proced")
 
-    (define-integration-dependencies "machines/i386" "machin" "rtlbase"
+    (define-integration-dependencies "machines/x86-64" "machin" "rtlbase"
       "rtlreg" "rtlty1" "rtlty2")
 
     (define-integration-dependencies "rtlbase" "rgraph" "base" "cfg1" "cfg2")
-    (define-integration-dependencies "rtlbase" "rgraph" "machines/i386"
+    (define-integration-dependencies "rtlbase" "rgraph" "machines/x86-64"
       "machin")
     (define-integration-dependencies "rtlbase" "rtlcfg" "base"
       "cfg1" "cfg2" "cfg3")
     (define-integration-dependencies "rtlbase" "rtlcon" "base" "cfg3" "utils")
-    (define-integration-dependencies "rtlbase" "rtlcon" "machines/i386"
+    (define-integration-dependencies "rtlbase" "rtlcon" "machines/x86-64"
       "machin")
     (file-dependency/integration/join (filename/append "rtlbase" "rtlcon")
                                      rtl-base)
@@ -479,12 +479,12 @@ USA.
       "rtlcfg" "rtlty2")
     (define-integration-dependencies "rtlbase" "rtlobj" "base"
       "cfg1" "object" "utils")
-    (define-integration-dependencies "rtlbase" "rtlreg" "machines/i386"
+    (define-integration-dependencies "rtlbase" "rtlreg" "machines/x86-64"
       "machin")
     (define-integration-dependencies "rtlbase" "rtlreg" "rtlbase"
       "rgraph" "rtlty1")
     (define-integration-dependencies "rtlbase" "rtlty1" "rtlbase" "rtlcfg")
-    (define-integration-dependencies "rtlbase" "rtlty2" "machines/i386"
+    (define-integration-dependencies "rtlbase" "rtlty2" "machines/x86-64"
       "machin")
     (define-integration-dependencies "rtlbase" "rtlty2" "rtlbase" "rtlty1")
 
@@ -498,7 +498,7 @@ USA.
                       "envopt" "folcon" "offset" "operan" "order" "param"
                       "outer" "reuse" "reteqv" "sideff" "simapp" "simple"
                       "subfre" "varind"))
-     (append i386-base front-end-base))
+     (append x86-64-base front-end-base))
 
     (define-integration-dependencies "fgopt" "reuse" "fgopt" "reord")
 
@@ -506,14 +506,14 @@ USA.
      (filename/append "rtlgen"
                      "fndblk" "fndvar" "opncod" "rgcomb" "rgproc" "rgretn"
                      "rgrval" "rgstmt" "rtlgen")
-     (append i386-base front-end-base rtl-base))
+     (append x86-64-base front-end-base rtl-base))
 
     (file-dependency/integration/join
      (append cse-all
             (filename/append "rtlopt" "ralloc" "rcompr" "rdebug" "rdflow"
                              "rerite" "rinvex" "rlife" "rtlcsm")
-            (filename/append "machines/i386" "rulrew"))
-     (append i386-base rtl-base))
+            (filename/append "machines/x86-64" "rulrew"))
+     (append x86-64-base rtl-base))
 
     (file-dependency/integration/join cse-all cse-base)
 

diff --git a/src/compiler/machines/x86-64/make.scm b/src/compiler/machines/x86-64/make.scm
index 8a934704c23631081e5cef931b6c2b74fdc5edae..ac6020505162d0eeae998ce2c7ffffcbbef1875c 100644 (file)
--- a/src/compiler/machines/x86-64/make.scm
+++ b/src/compiler/machines/x86-64/make.scm
@@ -27,6 +27,6 @@ USA.
 
 (declare (usual-integrations))
 
-(let ((value ((load "base/make") "i386")))
+(let ((value ((load "base/make") "x86-64")))
   (set! (access compiler:compress-top-level? (->environment '(compiler))) #t)
   value)
\ No newline at end of file