summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-03-29 00:49:53 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-03-29 00:49:53 -0700
commitfd77212b72427f57a800fceface8a85a5b5e4001 (patch)
tree51efdd03772f02ca863d357c42f090bf2e38a417 /src/arch/x86
parent0d5f6167ffbc78fb5e514a12875d6a873e054871 (diff)
downloadgem5-fd77212b72427f57a800fceface8a85a5b5e4001.tar.xz
Add code to generate register and immediate based integer op microop classes.
--HG-- extra : convert_revision : 718f941da74dd3b4557cd21e1772879ac21aa9c6
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/isa/main.isa3
-rw-r--r--src/arch/x86/isa/microops/microops.isa57
-rw-r--r--src/arch/x86/isa/operands.isa6
3 files changed, 63 insertions, 3 deletions
diff --git a/src/arch/x86/isa/main.isa b/src/arch/x86/isa/main.isa
index 146f714a7..e4103dea0 100644
--- a/src/arch/x86/isa/main.isa
+++ b/src/arch/x86/isa/main.isa
@@ -84,5 +84,8 @@ namespace X86ISA;
//Include the definitions for the instruction formats
##include "formats/formats.isa"
+//Include the definitions of the micro ops
+##include "microops/microops.isa"
+
//Include the decoder definition
##include "decoder/decoder.isa"
diff --git a/src/arch/x86/isa/microops/microops.isa b/src/arch/x86/isa/microops/microops.isa
new file mode 100644
index 000000000..bbf26f605
--- /dev/null
+++ b/src/arch/x86/isa/microops/microops.isa
@@ -0,0 +1,57 @@
+// 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
+
+//Micro ops
+##include "int.isa"
diff --git a/src/arch/x86/isa/operands.isa b/src/arch/x86/isa/operands.isa
index 20376f38f..36b0ee4df 100644
--- a/src/arch/x86/isa/operands.isa
+++ b/src/arch/x86/isa/operands.isa
@@ -96,7 +96,7 @@ def operand_types {{
}};
def operands {{
- # This is just copied from SPARC, because having no operands confuses
- # the parser.
- 'Rd': ('IntReg', 'udw', 'RD', 'IsInteger', 1)
+ 'IntRegOp0': ('IntReg', 'udw', 'regIndex0', 'IsInteger', 1),
+ 'IntRegOp1': ('IntReg', 'udw', 'regIndex1', 'IsInteger', 2),
+ 'IntRegOp2': ('IntReg', 'udw', 'regIndex2', 'IsInteger', 2),
}};