gem5.git
17 years agoAdd a stack size bitfield and expose the mode component of the ExtMachInst.
Gabe Black [Tue, 19 Jun 2007 14:15:21 +0000 (14:15 +0000)]
Add a stack size bitfield and expose the mode component of the ExtMachInst.

--HG--
extra : convert_revision : aad0ec51745fb94335898b0565bb11c1b399bbee

17 years agoAdd a function to print out segment names.
Gabe Black [Tue, 19 Jun 2007 14:14:17 +0000 (14:14 +0000)]
Add a function to print out segment names.

--HG--
extra : convert_revision : 8cbe3ca0d05165f7da5d6fa38c899ecc9e782511

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Mon, 18 Jun 2007 14:16:08 +0000 (14:16 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : fd64f2de0051afdc51e833a7cbf7fa120b230cc3

17 years agoGet rid of unnecessary output.
Gabe Black [Mon, 18 Jun 2007 14:15:47 +0000 (14:15 +0000)]
Get rid of unnecessary output.

--HG--
extra : convert_revision : 0df9a12788b8ce3225c113c095d5f13e49a7c544

17 years agoAdd in incomplete pick and merge functions which read and write pieces of registers...
Gabe Black [Mon, 18 Jun 2007 14:15:00 +0000 (14:15 +0000)]
Add in incomplete pick and merge functions which read and write pieces of registers, and fill out microcode disassembly.

--HG--
extra : convert_revision : 56332b3999a9079b1bd305ee2826abdf593367e1

17 years agosince the o3 cpu perlbmk regression doesn't work, just delete it. Perhaps the regress...
Ali Saidi [Sun, 17 Jun 2007 18:01:01 +0000 (14:01 -0400)]
since the o3 cpu perlbmk regression doesn't work, just delete it. Perhaps the regression will terminate now

--HG--
extra : convert_revision : 509e42c2abc4bce1f56dc0b6a69e5c27ab95f448

17 years agomemtest.cc:
Steve Reinhardt [Sat, 16 Jun 2007 21:05:05 +0000 (14:05 -0700)]
memtest.cc:
No need to initialize memory contents; should come up as 0.

src/cpu/memtest/memtest.cc:
    No need to initialize memory contents; should come up as 0.

--HG--
extra : convert_revision : 1713676956f3d33b4686fee2650bd17027bcc495

17 years agoAdd in some microregs.
Gabe Black [Thu, 14 Jun 2007 20:52:25 +0000 (20:52 +0000)]
Add in some microregs.

--HG--
extra : convert_revision : e8a894c2f7901329bd390a4cfd92209d0e29cf80

17 years agoSign extend byte immediates as well. There might need to be a fancier system in place...
Gabe Black [Thu, 14 Jun 2007 20:52:24 +0000 (20:52 +0000)]
Sign extend byte immediates as well. There might need to be a fancier system in place to handle this in the future.

--HG--
extra : convert_revision : 2c5bd719c770d9a93a57bd29782842f82384863d

17 years agoFix limm.
Gabe Black [Thu, 14 Jun 2007 20:52:23 +0000 (20:52 +0000)]
Fix limm.

--HG--
extra : convert_revision : ab76b11c2bb2f3abc0e7a84f7167d92d16ed074e

17 years agoImplement a handful more instructions and differentiate macroops based on the operand...
Gabe Black [Thu, 14 Jun 2007 20:52:22 +0000 (20:52 +0000)]
Implement a handful more instructions and differentiate macroops based on the operand types they expect.

--HG--
extra : convert_revision : f9c8e694a8c0eb33b988657dca03ab495b65bee8

17 years agoMove the high byte register indices to the right place.
Gabe Black [Thu, 14 Jun 2007 20:52:21 +0000 (20:52 +0000)]
Move the high byte register indices to the right place.

--HG--
extra : convert_revision : 3f04036d598b6572bab6ec06d162b97564a6529c

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Thu, 14 Jun 2007 20:52:20 +0000 (20:52 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : ba718de4d676f6d0bd80c29de46be1f6a2f73feb

17 years agoModified instruction decode method.
Vincentius Robby [Thu, 14 Jun 2007 20:52:19 +0000 (16:52 -0400)]
Modified instruction decode method.
Make code compatible with new decode method.

src/arch/alpha/remote_gdb.cc:
src/cpu/base_dyn_inst_impl.hh:
src/cpu/exetrace.cc:
src/cpu/simple/base.cc:
    Make code compatible with new decode method.
src/cpu/static_inst.cc:
src/cpu/static_inst.hh:
    Modified instruction decode method.

--HG--
extra : convert_revision : a9a6d3a16fff59bc95d0606ea344bd57e71b8d0a

17 years agoFix an assert to allow rounding mode 0.
Gabe Black [Thu, 14 Jun 2007 13:53:27 +0000 (13:53 +0000)]
Fix an assert to allow rounding mode 0.

--HG--
extra : convert_revision : 119cc87ccf939d3a0048d87d18e125deca378bb7

17 years agoMake POP special case its dataSize to default to 64 bits in 64 bit mode.
Gabe Black [Thu, 14 Jun 2007 13:52:08 +0000 (13:52 +0000)]
Make POP special case its dataSize to default to 64 bits in 64 bit mode.

--HG--
extra : convert_revision : 5c6251d962d9997676ffc795bb92eeb588caed39

17 years agoPut the mode in the ExtMachInst.
Gabe Black [Thu, 14 Jun 2007 13:50:58 +0000 (13:50 +0000)]
Put the mode in the ExtMachInst.

--HG--
extra : convert_revision : 7fc6567ab3d35c06901e6c8a0435f7cab819e17e

17 years agoGet rid of an unnecessary debug statement.
Gabe Black [Thu, 14 Jun 2007 13:49:23 +0000 (13:49 +0000)]
Get rid of an unnecessary debug statement.

--HG--
extra : convert_revision : 0b306dd96f5358474ad6a8bf4a949c12bcd139cd

17 years agoGet rid of some debug output and let macroops set headers in their constructor. The...
Gabe Black [Thu, 14 Jun 2007 13:47:52 +0000 (13:47 +0000)]
Get rid of some debug output and let macroops set headers in their constructor. The intention is to allow them to modify the emulation environment struct before it's used to construct its microops.

--HG--
extra : convert_revision : b04fc9ead8e3322fc3af3f14d75e2206ddfbe561

17 years agoFix up param regular expression to not duplicated the escaping \ and to pair up ...
Gabe Black [Thu, 14 Jun 2007 13:45:37 +0000 (13:45 +0000)]
Fix up param regular expression to not duplicated the escaping \ and to pair up \s correctly.

--HG--
extra : convert_revision : b4b790fb8cfd2a9e28568cf978eca70b1c65806b

17 years agoA fix for SPARC_FS compilation.
Gabe Black [Thu, 14 Jun 2007 13:27:08 +0000 (13:27 +0000)]
A fix for SPARC_FS compilation.

--HG--
extra : convert_revision : 8af0dd9c16e7db8ed92f7a71c396841d5ae7e072

17 years agoSeperate the pc-pc and the pc of the incoming bytes, and get rid of the "moreBytes...
Gabe Black [Wed, 13 Jun 2007 20:09:03 +0000 (20:09 +0000)]
Seperate the pc-pc and the pc of the incoming bytes, and get rid of the "moreBytes" which just takes a MachInst.

src/arch/x86/predecoder.cc:
    Seperate the pc-pc and the pc of the incoming bytes, and get rid of the "moreBytes" which just takes a MachInst. Also make the "opSize" field describe the number of bytes and not the log of the number of bytes.

--HG--
extra : convert_revision : 3a5ec7053ec69c5cba738a475d8b7fd9e6e6ccc0

17 years agoFix the operand type tag parser to recognize multi character register names.
Gabe Black [Wed, 13 Jun 2007 18:08:06 +0000 (18:08 +0000)]
Fix the operand type tag parser to recognize multi character register names.

--HG--
extra : convert_revision : e025620e29f2515d51240e96c4a05a4f74bdf72e

17 years agoPartially implement "POP"
Gabe Black [Wed, 13 Jun 2007 18:06:34 +0000 (18:06 +0000)]
Partially implement "POP"

--HG--
extra : convert_revision : ba454579a6a82ce4924102a633e5758fb2a30b2d

17 years agoMove load/store microops into their own file. They still don't do anything, though.
Gabe Black [Wed, 13 Jun 2007 18:05:08 +0000 (18:05 +0000)]
Move load/store microops into their own file. They still don't do anything, though.

--HG--
extra : convert_revision : 251763c614b9056c3ca7a85ef92c416552da893f

17 years agoFix the immediate version of register operations, and get their name to show up corre...
Gabe Black [Wed, 13 Jun 2007 18:01:23 +0000 (18:01 +0000)]
Fix the immediate version of register operations, and get their name to show up correctly.

--HG--
extra : convert_revision : 9fc36b99c9027e35f22983d5d1e22c940fa093de

17 years agoMinor comment fix up.
Gabe Black [Tue, 12 Jun 2007 17:35:11 +0000 (17:35 +0000)]
Minor comment fix up.

--HG--
extra : convert_revision : 20d517c4bc2aae54e53368c708b5abb27ed3a469

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Tue, 12 Jun 2007 17:19:14 +0000 (17:19 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 1d2efac895a1c8328026a079e0b319a436325616

17 years agoMake use of some of the REX prefix.
Gabe Black [Tue, 12 Jun 2007 16:47:10 +0000 (16:47 +0000)]
Make use of some of the REX prefix.

--HG--
extra : convert_revision : 948eceb59a1cd9b02ad9355dd5894af0bbec4e83

17 years agoReset the rex and legacy prefix components of the ExtMachInst as well.
Gabe Black [Tue, 12 Jun 2007 16:46:04 +0000 (16:46 +0000)]
Reset the rex and legacy prefix components of the ExtMachInst as well.

--HG--
extra : convert_revision : 832a324fec2d2b59f1c101d7fa72d7f670f0495d

17 years agoFlesh out the bitfields for prefixes.
Gabe Black [Tue, 12 Jun 2007 16:45:06 +0000 (16:45 +0000)]
Flesh out the bitfields for prefixes.

--HG--
extra : convert_revision : 0956b3d3532cba3856deda914d7cc708377b701b

17 years agoAdd in MOV instructions.
Gabe Black [Tue, 12 Jun 2007 16:31:42 +0000 (16:31 +0000)]
Add in MOV instructions.

--HG--
extra : convert_revision : 54a6b36dff3c15699faf2c767fc594359422c0ee

17 years agoFix up a comment that wasn't changed over to x86.
Gabe Black [Tue, 12 Jun 2007 16:30:48 +0000 (16:30 +0000)]
Fix up a comment that wasn't changed over to x86.

--HG--
extra : convert_revision : 58448b984447babba708b9dcb1b4939ed35308a6

17 years agoGet rid of unnecessary namespace prototype.
Gabe Black [Tue, 12 Jun 2007 16:29:49 +0000 (16:29 +0000)]
Get rid of unnecessary namespace prototype.

--HG--
extra : convert_revision : 388c0d6f2af96c4d33c1fe5d42a21866a4d71556

17 years agoUse objects to pass around output code, and fix/implement a few things.
Gabe Black [Tue, 12 Jun 2007 16:25:47 +0000 (16:25 +0000)]
Use objects to pass around output code, and fix/implement a few things.

src/arch/x86/isa/formats/multi.isa:
    Make the formats use objects to pass around output code.

--HG--
extra : convert_revision : 428915bda22e848befac15097f56375c1818426e

17 years agoAdd an address size bitfield to the isa description and the ExtMachInst
Gabe Black [Tue, 12 Jun 2007 16:23:42 +0000 (16:23 +0000)]
Add an address size bitfield to the isa description and the ExtMachInst

--HG--
extra : convert_revision : f8907ef5ef77e050eeb00d895263b49da4a9b6e9

17 years agoAdd some dprintfs
Gabe Black [Tue, 12 Jun 2007 16:22:35 +0000 (16:22 +0000)]
Add some dprintfs

--HG--
extra : convert_revision : 7e9a1feb808604364584893eed1735a8da1556fb

17 years agoMake microOp vs microop and macroOp vs macroop capitilization consistent.
Gabe Black [Tue, 12 Jun 2007 16:21:47 +0000 (16:21 +0000)]
Make microOp vs microop and macroOp vs macroop capitilization consistent.

src/arch/x86/isa/macroop.isa:
    Make microOp vs microop and macroOp vs macroop capitilization consistent. Also fill out the emulation environment handling a little more, and use an object to pass around output code.
src/arch/x86/isa/microops/base.isa:
    Make microOp vs microop and macroOp vs macroop capitilization consistent. Also adjust python to C++ bool translation.

--HG--
extra : convert_revision : 6f4bacfa334c42732c845f9a7f211cbefc73f96f

17 years agoupdate for small parameter and statistics name changes
Nathan Binkert [Tue, 12 Jun 2007 14:56:53 +0000 (07:56 -0700)]
update for small parameter and statistics name changes

--HG--
extra : convert_revision : d538b79986c11a462ab285c167cef45dd793da32

17 years agoRename enum from OpType to OpClass so it's consistent with the
Nathan Binkert [Tue, 12 Jun 2007 06:10:58 +0000 (23:10 -0700)]
Rename enum from OpType to OpClass so it's consistent with the
real thing.  Also rename the null case to something that can
be a C++ symbol.

--HG--
extra : convert_revision : e3bfc4065b59c21f613e486d234711c48d7c9070

17 years agothe cmd argument is supposed to be an array of parameters, not one string
Nathan Binkert [Sun, 10 Jun 2007 20:57:48 +0000 (13:57 -0700)]
the cmd argument is supposed to be an array of parameters, not one string

--HG--
extra : convert_revision : dffdaa94a1f28f3709515a9eeed420552d8c7b22

17 years agoAdd the -templatereduce option to swig to prepare for more templates.
Nathan Binkert [Sun, 10 Jun 2007 20:54:59 +0000 (13:54 -0700)]
Add the -templatereduce option to swig to prepare for more templates.
remove the old scanner and replace it with ours instead of just adding ours,
this fixes some issues with dependency tracking.

--HG--
extra : convert_revision : 925d42ad024deaea48a243067d0ea9542aeba324

17 years agoAdd a function to get a SimObject's memory mode and rework
Nathan Binkert [Sun, 10 Jun 2007 20:52:21 +0000 (13:52 -0700)]
Add a function to get a SimObject's memory mode and rework
the set memory mode code to only go through the change if
it is necessary

--HG--
extra : convert_revision : 28288227bb56b0a04d756776eaf0a4ff9e1f8c20

17 years agoAdd a startup function that will fast forward to the right clock edge
Nathan Binkert [Sun, 10 Jun 2007 06:01:47 +0000 (23:01 -0700)]
Add a startup function that will fast forward to the right clock edge
using a divide in order to not loop forever after resuming from a checkpoint

--HG--
extra : convert_revision : 4bbc70b1be4e5c4ed99d4f88418ab620d5ce475a

17 years agoUse the right type
Nathan Binkert [Sun, 10 Jun 2007 06:00:13 +0000 (23:00 -0700)]
Use the right type

--HG--
extra : convert_revision : b5ca3153ca786ea4e86bfe83f7760ba9ee41a882

17 years agoonly compile fenv.c if we're using fenv
Nathan Binkert [Sun, 10 Jun 2007 05:59:33 +0000 (22:59 -0700)]
only compile fenv.c if we're using fenv

--HG--
extra : convert_revision : 990726f724f99505fc999af82bfb1bbcd6c7f1a2

17 years agoMore realistic parameters
Nathan Binkert [Sun, 10 Jun 2007 05:43:08 +0000 (22:43 -0700)]
More realistic parameters

--HG--
extra : convert_revision : aaa4ea2b7c97df3d6b731e9252984b45715e9d6f

17 years agoFix another outdated comment.
Gabe Black [Fri, 8 Jun 2007 18:41:58 +0000 (18:41 +0000)]
Fix another outdated comment.

--HG--
extra : convert_revision : 55f89d9f96734e96ae082399df6b0206d112cd6c

17 years agoAdjust a few more comments.
Gabe Black [Fri, 8 Jun 2007 17:41:23 +0000 (17:41 +0000)]
Adjust a few more comments.

--HG--
extra : convert_revision : 9b79ce72acf8932ce26e1744a149f2fd2435ea96

17 years agoGet rid of a couple more unused files.
Gabe Black [Fri, 8 Jun 2007 17:32:57 +0000 (17:32 +0000)]
Get rid of a couple more unused files.

--HG--
extra : convert_revision : f66ca04d9428eecaa94c899c1ad598eccaae43e5

17 years agoFix up a potentially misleading comment.
Gabe Black [Fri, 8 Jun 2007 17:30:16 +0000 (17:30 +0000)]
Fix up a potentially misleading comment.

--HG--
extra : convert_revision : 58d37d8cc8e41c9640038d6dddae4cb5649638aa

17 years agoFix the formatting on a comment.
Gabe Black [Fri, 8 Jun 2007 17:16:05 +0000 (17:16 +0000)]
Fix the formatting on a comment.

--HG--
extra : convert_revision : 89636a7410dec54235416e3c16db98cc5eecf2b0

17 years agoClean up where files are included, and get rid of some cruft.
Gabe Black [Fri, 8 Jun 2007 17:14:39 +0000 (17:14 +0000)]
Clean up where files are included, and get rid of some cruft.

src/arch/x86/isa/main.isa:
    Clean up where files are included.

--HG--
extra : convert_revision : 0528359432bf0fb9198b63de9611176bc78e07c7

17 years agoClean things up a little.
Gabe Black [Fri, 8 Jun 2007 17:06:34 +0000 (17:06 +0000)]
Clean things up a little.

--HG--
extra : convert_revision : 62ad0839847db85738054da6f7da8a956b24143e

17 years agoGet rid of the old isa_parser file versions of the microcode definitions.
Gabe Black [Fri, 8 Jun 2007 17:05:50 +0000 (17:05 +0000)]
Get rid of the old isa_parser file versions of the microcode definitions.

--HG--
extra : convert_revision : 601fbf1fbdf716c82c68ffefad01aed0cadf45aa

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Fri, 8 Jun 2007 16:13:45 +0000 (16:13 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 4a2f2884a9d1125dc3156e080931ddc40defcfc7

17 years agoMove the microcode assembly to a python package instead of isa_parser files. Also...
Gabe Black [Fri, 8 Jun 2007 16:13:20 +0000 (16:13 +0000)]
Move the microcode assembly to a python package instead of isa_parser files. Also, the code is now a single string which runs through the microcode assembler rather than docstrings associated with classes named after each architectural level instruction.

--HG--
extra : convert_revision : 20e6d6ac625dde8f1885acc445882096df562778

17 years agoBig changes to use the new microcode assembler.
Gabe Black [Fri, 8 Jun 2007 16:09:43 +0000 (16:09 +0000)]
Big changes to use the new microcode assembler.

--HG--
extra : convert_revision : 7d1a43c5791a2e7e30533746da3dd7036a5b8799

17 years agoFixed format arguments for XOR.
Gabe Black [Fri, 8 Jun 2007 16:07:31 +0000 (16:07 +0000)]
Fixed format arguments for XOR.

--HG--
extra : convert_revision : d64fe734fcdcc414ba9af9fc5f0f795429d5dad3

17 years agoAdd a bitfield to refer to the opSize member of the extMachInst.
Gabe Black [Fri, 8 Jun 2007 16:06:22 +0000 (16:06 +0000)]
Add a bitfield to refer to the opSize member of the extMachInst.

--HG--
extra : convert_revision : 1854ebc00a9f3ae8c36cc579de6c3a2b48c0fdb6

17 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Ali Saidi [Tue, 5 Jun 2007 05:03:43 +0000 (01:03 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/tmp/newmem

--HG--
extra : convert_revision : e0721f59cce9cb356b53977e21bd4a7c779c217d

17 years agoClean up some of vincent's code and commit it
Ali Saidi [Tue, 5 Jun 2007 05:03:35 +0000 (01:03 -0400)]
Clean up some of vincent's code and commit it
Makes page table cache scheme actually work

src/mem/page_table.cc:
src/mem/page_table.hh:
    fix caching scheme to actually work and improve performance

--HG--
extra : convert_revision : 443a8d8acbee540b26affcfdfbf107b8e735d1bd

17 years agoMake limm (load immediate) microop
Gabe Black [Mon, 4 Jun 2007 19:53:06 +0000 (19:53 +0000)]
Make limm (load immediate) microop

--HG--
extra : convert_revision : f4883febd92cfade61c1a6a31fdb2d27296d9044

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Mon, 4 Jun 2007 19:53:05 +0000 (19:53 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 77222b85492c8ad6c0b776fa34c83065c77c402e

17 years agodon't be so aggressive with the tracing on #if
Ali Saidi [Mon, 4 Jun 2007 19:53:04 +0000 (15:53 -0400)]
don't be so aggressive with the tracing on #if

--HG--
extra : convert_revision : 8ee88bff8010dcb7a412f6a6b49d40fad1c0bb68

17 years agofix SPARC....
Ali Saidi [Mon, 4 Jun 2007 16:03:38 +0000 (12:03 -0400)]
fix SPARC....

configs/common/FSConfig.py:
    fix SPARC

--HG--
extra : convert_revision : 34a36c0f626f3fb8a1526ec194a9b0cdae32fed4

17 years agoReworking x86's microcode system. This is a work in progress, and X86 doesn't compile.
Gabe Black [Mon, 4 Jun 2007 15:59:20 +0000 (15:59 +0000)]
Reworking x86's microcode system. This is a work in progress, and X86 doesn't compile.

src/arch/x86/isa/decoder/one_byte_opcodes.isa:
src/arch/x86/isa/macroop.isa:
src/arch/x86/isa/main.isa:
src/arch/x86/isa/microasm.isa:
src/arch/x86/isa/microops/base.isa:
src/arch/x86/isa/microops/microops.isa:
src/arch/x86/isa/operands.isa:
src/arch/x86/isa/microops/regop.isa:
src/arch/x86/isa/microops/specop.isa:
    Reworking x86's microcode system

--HG--
extra : convert_revision : cab66be59ed758b192226af17eddd5a86aa190f3

17 years agoDon't mask the pc because the Alpha predecoder needs it to set the PAL mode bit in...
Gabe Black [Sat, 2 Jun 2007 03:41:47 +0000 (03:41 +0000)]
Don't mask the pc because the Alpha predecoder needs it to set the PAL mode bit in the ExtMachInst.

--HG--
extra : convert_revision : 87dc6e6b2281b6a11a0c0e8320b7f4acc29f6fb8

17 years agoFix typo so m5.fast will compile
Nathan Binkert [Sat, 2 Jun 2007 03:41:46 +0000 (20:41 -0700)]
Fix typo so m5.fast will compile

--HG--
extra : convert_revision : 8ceb816c17108d7cb65cb46d8dc2bd2753b0e0f0

17 years agoMerge zizzer:/bk/newmem
Ali Saidi [Fri, 1 Jun 2007 18:55:17 +0000 (14:55 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 43dc3a23758e7956572d59464ebddcc56e82728b

17 years agoMerge zizzer:/bk/newmem
Ali Saidi [Fri, 1 Jun 2007 18:18:45 +0000 (14:18 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

src/cpu/simple/base.cc:
    hand merge vincent/gabe/my changes to cast sizeof() to a 64bit int

--HG--
extra : convert_revision : eb989b4d65d08057df1777c04b8ee2cfa75a2695

17 years agocast sizeof(MachInst) to Addr before generating a mask
Ali Saidi [Fri, 1 Jun 2007 18:16:58 +0000 (14:16 -0400)]
cast sizeof(MachInst) to Addr before generating a mask

--HG--
extra : convert_revision : 1ae34a069bbd997a8f888f69415fbeaaf4ade0b3

17 years agodon't generate trace data unless tracing is on
Ali Saidi [Fri, 1 Jun 2007 17:44:24 +0000 (13:44 -0400)]
don't generate trace data unless tracing is on

--HG--
extra : convert_revision : 3953ace8d481d758d6e0d89183c0a7e7bebcf681

17 years agoClean things up
Gabe Black [Fri, 1 Jun 2007 16:24:51 +0000 (16:24 +0000)]
Clean things up

--HG--
extra : convert_revision : 72ffcf5492d4e4f899ea5761639147e001c525b0

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Fri, 1 Jun 2007 16:24:50 +0000 (16:24 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : de6db1dbe0db519e75d723c7221a60f54b713f8f

17 years agoMinor error. Forgotten to remove brackets for threadPC.
Vincentius Robby [Fri, 1 Jun 2007 16:24:49 +0000 (12:24 -0400)]
Minor error. Forgotten to remove brackets for threadPC.

--HG--
extra : convert_revision : 40a636a539e84decfca438c07adf022eed7b7780

17 years agoAdd a second section to make sure the ROM is extended properly.
Gabe Black [Thu, 31 May 2007 22:21:21 +0000 (22:21 +0000)]
Add a second section to make sure the ROM is extended properly.

--HG--
extra : convert_revision : a69c09c5e62c8b00d6c8039199c02e8fecbf9f2f

17 years agoAdd rom based macroops into the macroop dict instead of dropping them on the floor
Gabe Black [Thu, 31 May 2007 22:21:20 +0000 (22:21 +0000)]
Add rom based macroops into the macroop dict instead of dropping them on the floor

--HG--
extra : convert_revision : 964391c8050af0239da32bcc77550740de1f3160

17 years agoDo something with ROM based macroops
Gabe Black [Thu, 31 May 2007 22:21:19 +0000 (22:21 +0000)]
Do something with ROM based macroops

--HG--
extra : convert_revision : 3a14c683ab89217c083c58e8c374607dd04b66c4

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Thu, 31 May 2007 22:21:18 +0000 (22:21 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : c99372d62e4e6acdced977da8480f2379b6f00a1

17 years agoMerge zizzer:/bk/newmem
Ali Saidi [Thu, 31 May 2007 22:21:17 +0000 (18:21 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 5298568783db2238a90ce8aca8ad5ba57b7d4aab

17 years agoThis is probably a more scons like way to do this
Ali Saidi [Thu, 31 May 2007 22:01:07 +0000 (18:01 -0400)]
This is probably a more scons like way to do this

--HG--
extra : convert_revision : 2cbd05039bbefcc067310098c6c1c1022302fb10

17 years agoMake directives take parameters and use the directive function and not it's name
Gabe Black [Thu, 31 May 2007 20:45:06 +0000 (20:45 +0000)]
Make directives take parameters and use the directive function and not it's name

--HG--
extra : convert_revision : fbc93ba592b0cc009696e8d7edead841ec2ea01c

17 years agoHandle comments
Gabe Black [Thu, 31 May 2007 20:45:05 +0000 (20:45 +0000)]
Handle comments

--HG--
extra : convert_revision : 3f93baaf250922eb40d8718e978273b0def1e4dd

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Thu, 31 May 2007 20:45:04 +0000 (20:45 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

src/cpu/simple/base.cc:
    Hand merge

--HG--
extra : convert_revision : a2902ef9d917d22ffb9c7dfa2fd444694a65240d

17 years agoobey the m5 style
Nathan Binkert [Thu, 31 May 2007 20:45:03 +0000 (13:45 -0700)]
obey the m5 style

--HG--
extra : convert_revision : ac0d55c651a2bb6823cbf5a31c6f57ec163730ab

17 years agoMerge zizzer:/bk/newmem
Vincentius Robby [Thu, 31 May 2007 20:02:31 +0000 (16:02 -0400)]
Merge zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/.automount/greenville/w/acolyte/newmem

--HG--
extra : convert_revision : c80b7ef5a2cc4ab1b86bb1eef7fae91886a7737d

17 years agoAssign traceData to be NULL at BaseSimpleCPU constructor.
Vincentius Robby [Thu, 31 May 2007 20:01:41 +0000 (16:01 -0400)]
Assign traceData to be NULL at BaseSimpleCPU constructor.
Initialize a temporary variable for thread->readPC() at setupFetchRequest() to reduce function calls.
exec tracing isn't needed for m5.fast binaries
Moved MISCREG_GL, MISCREG_CWP, and MISCREG_TLB_DATA out of switch statement and use if blocks instead.

src/arch/sparc/miscregfile.cc:
    Moved MISCREG_GL, MISCREG_CWP, and MISCREG_TLB_DATA out of switch statement and use if blocks instead.
src/cpu/simple/base.cc:
    Assign traceData to be NULL at BaseSimpleCPU constructor.
    Initialize a temporary variable for thread->readPC() at setupFetchRequest() to reduce function calls.
    exec tracing isn't needed for m5.fast binaries

--HG--
extra : convert_revision : 5dc92fff05c9bde994f1e0f1bb40e11c44eb72c6

17 years agoMerge zizzer:/bk/newmem
Ali Saidi [Thu, 31 May 2007 19:33:30 +0000 (15:33 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 39a8dd1793697a8ceb57ddfc4588640461586ba8

17 years agocheck that m4 is available before trying to use it
Ali Saidi [Thu, 31 May 2007 19:33:17 +0000 (15:33 -0400)]
check that m4 is available before trying to use it

--HG--
extra : convert_revision : 8d4d75451fc003e3843e306008ad0632bbf0217a

17 years agoEarly micro assembler
Gabe Black [Thu, 31 May 2007 13:52:48 +0000 (13:52 +0000)]
Early micro assembler

src/arch/micro_asm.py:
    Micro assembler
src/arch/micro_asm_test.py:
    Test script for the micro assembler. This probably should go somewhere else eventually.

--HG--
extra : convert_revision : 277fdadec94763ae657f55f501704693b81e0015

17 years agox86 work that hadn't been checked in.
Gabe Black [Thu, 31 May 2007 13:50:35 +0000 (13:50 +0000)]
x86 work that hadn't been checked in.

src/arch/x86/isa/decoder/one_byte_opcodes.isa:
    Give the "MOV" instruction the format of it's arguments. This will likely need to be completely overhauled in the near future.
src/arch/x86/predecoder.cc:
src/arch/x86/predecoder.hh:
    Make the predecoder explicitly reset itself rather than counting on it happening naturally.
src/arch/x86/predecoder_tables.cc:
    Fix the immediate size table
src/arch/x86/regfile.cc:
    nextnpc is bogus

--HG--
extra : convert_revision : 0926701fedaab41817e64bb05410a25174484a5a

17 years agoFix cut-n-pasto to make the path correct
Nathan Binkert [Thu, 31 May 2007 00:19:20 +0000 (17:19 -0700)]
Fix cut-n-pasto to make the path correct

--HG--
extra : convert_revision : a6194cc9c3b2eb83dc8480ed0417b2246f07b4bd

17 years agoFix compiling on Solaris since Nate's libelf change
Ali Saidi [Wed, 30 May 2007 21:08:12 +0000 (17:08 -0400)]
Fix compiling on Solaris since Nate's libelf change

SConstruct:
    export env after we've set CC/CXX
ext/libelf/SConscript:
    pull in the CC/CXX variables from env. Use gm4 if it exists
ext/libelf/elf_begin.c:
ext/libelf/libelf_allocate.c:
    include errno.h instead of sys/errno.h
ext/libelf/elf_common.h:
    use the more standard uintX_t
ext/libelf/elf_strptr.c:
ext/libelf/elf_update.c:
    include sysmacros.h on Solaris for roundup()

--HG--
extra : convert_revision : ea1aab834029399c445dfa4c9f78febf2c3d8f0c

17 years agotport.cc:
Steve Reinhardt [Wed, 30 May 2007 05:53:28 +0000 (01:53 -0400)]
tport.cc:
Oops... forgot to update call site after changing
function argument semantics.

src/mem/tport.cc:
    Oops... forgot to update call site after changing
    function argument semantics.

--HG--
extra : convert_revision : 9234b991dc678f062d268ace73c71b3d13dd17dc

17 years agoA little more cleanup & refactoring of SimpleTimingPort.
Steve Reinhardt [Wed, 30 May 2007 05:23:41 +0000 (22:23 -0700)]
A little more cleanup & refactoring of SimpleTimingPort.
Make it a better base class for cache ports.

--HG--
extra : convert_revision : 37d6de11545a68c1a7d11ce33fe5971c51434ee4

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Steve Reinhardt [Mon, 28 May 2007 22:41:05 +0000 (15:41 -0700)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : f93aaeabed0da9eeec8eb6f055fb1e31d5d97203

17 years agoFix M4 command line... wasn't working on zizzer.
Steve Reinhardt [Mon, 28 May 2007 22:39:35 +0000 (18:39 -0400)]
Fix M4 command line... wasn't working on zizzer.
A little more concise now.

--HG--
extra : convert_revision : 5cb46832ac7ce7a0be72765e83c8ceb5d8d4b64a

17 years agoRestructure SimpleTimingPort a bit:
Steve Reinhardt [Mon, 28 May 2007 15:11:43 +0000 (08:11 -0700)]
Restructure SimpleTimingPort a bit:
- factor out checkFunctional() code so it can be
called from derived classes
- use EventWrapper for sendEvent, move event handling
code from event to port where it belongs
- make sendEvent a pointer so derived classes can
override it
- replace std::pair with new class for readability

--HG--
extra : convert_revision : 5709de2daacfb751a440144ecaab5f9fc02e6b7a

17 years agoReformat comments to meet line length restriction.
Steve Reinhardt [Mon, 28 May 2007 15:04:33 +0000 (08:04 -0700)]
Reformat comments to meet line length restriction.

--HG--
extra : convert_revision : 24c00ec4904d9fb4d6e39521e0ff8b8f60d60f6a