From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 16 Dec 2022 00:57:24 +0000 (-0800)
Subject: Fix compilation issues in svm1 build.
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=37fb28dbe3722c4e6560ace2deaaac699fcd53ca;p=mit-scheme.git

Fix compilation issues in svm1 build.
---

diff --git a/src/microcode/svm1-interp.c b/src/microcode/svm1-interp.c
index 80c75a9d3..1b7b319c5 100644
--- a/src/microcode/svm1-interp.c
+++ b/src/microcode/svm1-interp.c
@@ -31,6 +31,11 @@ USA.
 #include "fixnum.h"
 #include "svm1-defns.h"
 #include "cmpintmd/svm1.h"
+
+#undef not
+#undef and
+#undef or
+#undef xor
 
 #ifndef __GNUC__
 #  define GNUC_PREREQ(x, y) 0
@@ -1285,8 +1290,9 @@ DEFINE_BINARY_WR (xor, XOR, OP_XOR)
 DEFINE_INST (lsh)
 {
   DECODE_SVM1_INST_LSH (target, source1, source2);
-  long n = (TO_SIGNED (WREG_REF (source2)));
-  WREG_SET (target, FIXNUM_LSH((WREG_REF (source1)), n));
+  long n1 = (TO_SIGNED (WREG_REF (source1)));
+  long n2 = (TO_SIGNED (WREG_REF (source2)));
+  WREG_SET (target, FIXNUM_LSH(n1, n2));
   NEXT_PC;
 }