More changes.

diff --git a/v7/src/compiler/machines/i386/instr1.scm b/v7/src/compiler/machines/i386/instr1.scm
index 3ce407bda31d9edb12e7094cc69a272aeb547aed..e82f252f1e7205dad8ff28ba896c06c825c3b8ef 100644 (file)
--- a/v7/src/compiler/machines/i386/instr1.scm
+++ b/v7/src/compiler/machines/i386/instr1.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/i386/instr1.scm,v 1.5 1992/02/13 02:43:12 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/i386/instr1.scm,v 1.6 1992/02/13 03:22:20 jinx Exp $
 
 Copyright (c) 1992 Massachusetts Institute of Technology
 
@@ -199,11 +199,15 @@ MIT in each case. |#
   (define-bit-test-instruction BTS #xab 5))
 \f  
 (define-instruction CALL
-  (((@PCR ,dest))
+  (((@PCR (? dest)))
    (BYTE (8 #xe8))
    (IMMEDIATE `(- ,dest (+ *PC* ,*ADDRESS-SIZE*)) ADDRESS))
 
-  (((@PCO ,displ))
+  (((@PCRO (? dest) (? offset)))
+   (BYTE (8 #xe8))
+   (IMMEDIATE `(- (+ ,dest ,offset) (+ *PC* ,*ADDRESS-SIZE*)) ADDRESS))
+
+  (((@PCO (? displ)))
    (BYTE (8 #xe8))
    (IMMEDIATE displ ADDRESS))
 
@@ -462,6 +466,16 @@ MIT in each case. |#
      (BYTE (8 #xe9)
           (32 (- disp 3) SIGNED)))))
 
+  (((@PCRO (? dest) (? offset)))
+   (VARIABLE-WIDTH
+    (disp `(- (+ ,dest ,offset) (+ *PC* 2)))
+    ((-128 127)
+     (BYTE (8 #xeb)
+          (8 disp SIGNED)))
+    ((() ())
+     (BYTE (8 #xe9)
+          (32 (- disp 3) SIGNED)))))
+
   (((? dest r/mW))
    (BYTE (8 #xff))
    (ModR/M 4 dest))

diff --git a/v7/src/compiler/machines/i386/rules3.scm b/v7/src/compiler/machines/i386/rules3.scm
index 54ca32c88e840a356c805824f690db7325205b19..b798ca248fdf76bfe5f43d3e70e1e53595a4b344 100644 (file)
--- a/v7/src/compiler/machines/i386/rules3.scm
+++ b/v7/src/compiler/machines/i386/rules3.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/i386/rules3.scm,v 1.8 1992/02/11 14:48:20 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/i386/rules3.scm,v 1.9 1992/02/13 03:18:38 jinx Exp $
 $MC68020-Header: /scheme/compiler/bobcat/RCS/rules3.scm,v 4.31 1991/05/28 19:14:55 jinx Exp $
 
 Copyright (c) 1992 Massachusetts Institute of Technology
@@ -108,13 +108,13 @@ MIT in each case. |#
   (INVOCATION:UUO-LINK (? frame-size) (? continuation) (? name))
   continuation
   (LAP ,@(clear-map!)
-       (JMP (@PCRO ,(free-uuo-link-label name frame-size) 2))))
+       (JMP (@PCRO ,(free-uuo-link-label name frame-size) 3))))
 \f
 (define-rule statement
   (INVOCATION:GLOBAL-LINK (? frame-size) (? continuation) (? name))
   continuation
   (LAP ,@(clear-map!)
-       (JMP (@PCRO ,(global-uuo-link-label name frame-size) 2))))
+       (JMP (@PCRO ,(global-uuo-link-label name frame-size) 3))))
 
 (define-rule statement
   (INVOCATION:CACHE-REFERENCE (? frame-size) (? continuation) (? extension))