diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-26 18:57:35 -0500 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-26 18:57:35 -0500 |
commit | 5f51fe20de64eb7a32083eedac0bd27938b1deb7 (patch) | |
tree | eb54f7a7b329d45fab45cc9d9a0779f61dc13a26 /src/arch/sparc/isa/formats | |
parent | 6d9d0c68b574ceba53fc36d34b83f7109e00b1d0 (diff) | |
parent | 2939d7d061efc8444c06ac52f82c8aeaf0048aaf (diff) | |
download | gem5-5f51fe20de64eb7a32083eedac0bd27938b1deb7.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 53ee81b099930d4d827db99e2d944ffb8645c706
Diffstat (limited to 'src/arch/sparc/isa/formats')
-rw-r--r-- | src/arch/sparc/isa/formats/basic.isa | 1 | ||||
-rw-r--r-- | src/arch/sparc/isa/formats/mem/util.isa | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/arch/sparc/isa/formats/basic.isa b/src/arch/sparc/isa/formats/basic.isa index 9805c7c0b..56b201bd6 100644 --- a/src/arch/sparc/isa/formats/basic.isa +++ b/src/arch/sparc/isa/formats/basic.isa @@ -72,6 +72,7 @@ def template BasicExecute {{ { Fault fault = NoFault; + %(fp_enable_check)s; %(op_decl)s; %(op_rd)s; %(code)s; diff --git a/src/arch/sparc/isa/formats/mem/util.isa b/src/arch/sparc/isa/formats/mem/util.isa index b6e0945b7..3b02f58de 100644 --- a/src/arch/sparc/isa/formats/mem/util.isa +++ b/src/arch/sparc/isa/formats/mem/util.isa @@ -1,4 +1,4 @@ -// Copyright (c) 2006 The Regents of The University of Michigan +// Copyright (c) 2006-2007 The Regents of The University of Michigan // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -141,6 +141,7 @@ def template LoadExecute {{ { Fault fault = NoFault; Addr EA; + %(fp_enable_check)s; %(op_decl)s; %(op_rd)s; %(ea_code)s; @@ -169,6 +170,7 @@ def template LoadExecute {{ Fault fault = NoFault; Addr EA; uint%(mem_acc_size)s_t Mem; + %(fp_enable_check)s; %(ea_decl)s; %(ea_rd)s; %(ea_code)s; @@ -206,6 +208,7 @@ def template StoreExecute {{ //It should be optomized out in all the others bool storeCond = true; Addr EA; + %(fp_enable_check)s; %(op_decl)s; %(op_rd)s; %(ea_code)s; @@ -235,6 +238,7 @@ def template StoreExecute {{ Fault fault = NoFault; bool storeCond = true; Addr EA; + %(fp_enable_check)s; %(op_decl)s; %(op_rd)s; %(ea_code)s; |