Get rid of x86_instrs.h

diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt
index 2699b67..81fd122 100644 (file)
--- a/src/jit/CMakeLists.txt
+++ b/src/jit/CMakeLists.txt
@@ -185,7 +185,6 @@ if (WIN32)
     valuenumtype.h
     varset.h
     vartype.h
-    x86_instrs.h
   )
 endif(WIN32)
 

diff --git a/src/jit/instr.h b/src/jit/instr.h
index c7be413..efa9412 100644 (file)
--- a/src/jit/instr.h
+++ b/src/jit/instr.h
@@ -33,7 +33,8 @@ enum instruction : unsigned
     #define INST8(id, nm, fp, ldst, fmt, e1, e2, e3, e4, e5, e6, e7, e8    ) INS_##id,
     #define INST9(id, nm, fp, ldst, fmt, e1, e2, e3, e4, e5, e6, e7, e8, e9) INS_##id,
     #include "instrs.h"
-    #include "x86_instrs.h"
+
+    INS_lea,   // Not a real instruction. It is used for load the address of stack locals
 
 #elif defined(_TARGET_ARM64_)
     #define INST1(id, nm, fp, ldst, fmt, e1                                ) INS_##id,

diff --git a/src/jit/x86_instrs.h b/src/jit/x86_instrs.h
deleted file mode 100644 (file)
index 1c3489d..0000000
--- a/src/jit/x86_instrs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-//
-//  This is a temporary file which defined the x86 instructions that
-//  are currently still referenced when building the Arm Jit compiler
-//
-
-INS_lea,