Define symbols for the x86 specialization of the microassembler.

--HG--
extra : convert_revision : 1fd66ba519d211fec18641b6df94b7640c56080c

diff --git a/src/arch/x86/isa/microasm.isa b/src/arch/x86/isa/microasm.isa
index 50addb33fc6f230526db7cba004d9ee4e7a1ca76..4e06f43919a67b55044fa905ba6e30fec7f8715c 100644 (file)
--- a/src/arch/x86/isa/microasm.isa
+++ b/src/arch/x86/isa/microasm.isa
@@ -72,5 +72,33 @@ let {{
     from micro_asm import MicroAssembler, Rom_Macroop, Rom
     mainRom = Rom('main ROM')
     assembler = MicroAssembler(X86Macroop, microopClasses, mainRom, Rom_Macroop)
+    # Add in symbols for the microcode registers
+    for num in range(15):
+        assembler.symbols["t%d" % num] = "NUM_INTREGS+%d" % num
+    # Add in symbols for the segment descriptor registers
+    for letter in ("C", "D", "E", "F", "G", "S"):
+        assembler.symbols["%ss" % letter.lower()] = "SEGMENT_REG_%sS" % letter
+    # Miscellaneous symbols
+    symbols = {
+        "reg" : "env.reg",
+        "regm" : "env.regm",
+        "imm" : "IMMEDIATE",
+        "disp" : "DISPLACEMENT",
+        "scale" : "env.scale",
+        "index" : "env.index",
+        "base" : "env.base",
+        "dsz" : "env.dataSize",
+        "osz" : "env.operandSize",
+        "ssz" : "env.stackSize"
+    }
+    assembler.symbols.update(symbols)
+
+    # Code literal which forces a default 64 bit operand size in 64 bit mode.
+    assembler.symbols["oszIn64Override"] = '''
+    if (machInst.mode.submode == SixtyFourBitMode &&
+            env.dataSize == 4)
+        env.dataSize = 8;
+    '''
+
     macroopDict = assembler.assemble(microcode)
 }};

diff --git a/src/arch/x86/segmentregs.hh b/src/arch/x86/segmentregs.hh
new file mode 100644 (file)
index 0000000..9fd9bcb
--- /dev/null
+++ b/src/arch/x86/segmentregs.hh
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2007 The Hewlett-Packard Development Company
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms,
+ * with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * The software must be used only for Non-Commercial Use which means any
+ * use which is NOT directed to receiving any direct monetary
+ * compensation for, or commercial advantage from such use.  Illustrative
+ * examples of non-commercial use are academic research, personal study,
+ * teaching, education and corporate research & development.
+ * Illustrative examples of commercial use are distributing products for
+ * commercial advantage and providing services using the software for
+ * commercial advantage.
+ *
+ * If you wish to use this software or functionality therein that may be
+ * covered by patents for commercial use, please contact:
+ *     Director of Intellectual Property Licensing
+ *     Office of Strategy and Technology
+ *     Hewlett-Packard Company
+ *     1501 Page Mill Road
+ *     Palo Alto, California  94304
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.  Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.  Neither the name of
+ * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.  No right of
+ * sublicense is granted herewith.  Derivatives of the software and
+ * output created using the software may be prepared, but only for
+ * Non-Commercial Uses.  Derivatives of the software may be shared with
+ * others provided: (i) the others agree to abide by the list of
+ * conditions herein which includes the Non-Commercial Use restrictions;
+ * and (ii) such Derivatives of the software include the above copyright
+ * notice to acknowledge the contribution from this software where
+ * applicable, this list of conditions and the disclaimer below.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#ifndef __ARCH_X86_SEGMENTREGS_HH__
+#define __ARCH_X86_SEGMENTREGS_HH__
+
+namespace X86ISA
+{
+    enum SegmentRegIndex
+    {
+        SEGMENT_REG_ES,
+        SEGMENT_REG_CS,
+        SEGMENT_REG_SS,
+        SEGMENT_REG_DS,
+        SEGMENT_REG_FS,
+        SEGMENT_REG_GS,
+
+        NUM_SEGMENTREGS
+    };
+};
+
+#endif // __ARCH_X86_SEGMENTREGS_HH__