summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-05-25 19:29:32 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-05-25 19:29:32 -0700
commita3ae9486d543f23cd4203381e7bcf2ce86c51389 (patch)
treed66d3b9851f3002d0746c7af830062480f83773d /src/arch
parentad02a59f89139a75dfcfaa7a79498e54f7ce7e5d (diff)
parent44ebb8d3e27329e9f0b501897585359b4ab696f2 (diff)
downloadgem5-a3ae9486d543f23cd4203381e7bcf2ce86c51389.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into doughnut.mwconnections.com:/home/gblack/m5/newmem-x86 --HG-- extra : convert_revision : 276d00a73b1834d5262129c3f7e0f7fae18e23bc
Diffstat (limited to 'src/arch')
-rwxr-xr-xsrc/arch/isa_parser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py
index 57d58cc9d..7edb9f3d7 100755
--- a/src/arch/isa_parser.py
+++ b/src/arch/isa_parser.py
@@ -40,8 +40,8 @@ from types import *
# of 'build' in the current tree.
sys.path[0:0] = [os.environ['M5_PLY']]
-import lex
-import yacc
+from ply import lex
+from ply import yacc
#####################################################################
#