changeset 340b6f01d69b in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=340b6f01d69b
description:
SPARC: Clean up some historical style issues.
diffstat:
src/arch/sparc/asi.cc | 501 ++++++++++++------------
src/arch/sparc/asi.hh | 473 +++++++++++-----------
src/arch/sparc/faults.cc | 348 ++++++++--------
src/arch/sparc/faults.hh | 54 +-
src/arch/sparc/handlers.hh | 260 ++++++------
src/arch/sparc/interrupts.hh | 4 +-
src/arch/sparc/isa.cc | 72 +-
src/arch/sparc/isa.hh | 264 ++++++------
src/arch/sparc/isa/base.isa | 100 ++--
src/arch/sparc/isa/decoder.isa | 557 +++++++++++++--------------
src/arch/sparc/isa/formats/basic.isa | 9 +-
src/arch/sparc/isa/formats/branch.isa | 59 +-
src/arch/sparc/isa/formats/formats.isa | 22 +-
src/arch/sparc/isa/formats/integerop.isa | 52 +-
src/arch/sparc/isa/formats/mem/blockmem.isa | 32 +-
src/arch/sparc/isa/formats/mem/mem.isa | 8 +-
src/arch/sparc/isa/formats/mem/swap.isa | 46 +-
src/arch/sparc/isa/formats/mem/util.isa | 100 ++--
src/arch/sparc/isa/formats/micro.isa | 23 +-
src/arch/sparc/isa/formats/nop.isa | 2 +-
src/arch/sparc/isa/formats/priv.isa | 50 +-
src/arch/sparc/isa/formats/trap.isa | 14 +-
src/arch/sparc/isa/main.isa | 12 +-
src/arch/sparc/isa/operands.isa | 9 +-
src/arch/sparc/isa_traits.hh | 74 +-
src/arch/sparc/linux/process.cc | 10 +-
src/arch/sparc/linux/process.hh | 12 +-
src/arch/sparc/linux/syscalls.cc | 247 ++++++------
src/arch/sparc/microcode_rom.hh | 2 +-
src/arch/sparc/miscregs.hh | 214 +++++-----
src/arch/sparc/mmaped_ipr.hh | 2 +-
src/arch/sparc/nativetrace.cc | 8 +-
src/arch/sparc/pagetable.cc | 5 +-
src/arch/sparc/pagetable.hh | 36 +-
src/arch/sparc/predecoder.hh | 114 ++--
src/arch/sparc/process.cc | 163 ++++----
src/arch/sparc/process.hh | 11 +-
src/arch/sparc/registers.hh | 61 +-
src/arch/sparc/remote_gdb.cc | 22 +-
src/arch/sparc/remote_gdb.hh | 46 +-
src/arch/sparc/sparc_traits.hh | 34 +-
src/arch/sparc/stacktrace.hh | 29 +-
src/arch/sparc/system.hh | 12 +-
src/arch/sparc/tlb.cc | 74 +--
src/arch/sparc/tlb.hh | 7 +-
src/arch/sparc/tlb_map.hh | 36 +-
src/arch/sparc/types.hh | 17 +-
src/arch/sparc/ua2005.cc | 10 +-
src/arch/sparc/utility.cc | 110 +++--
src/arch/sparc/utility.hh | 77 +-
src/arch/sparc/vtophys.cc | 4 +-
51 files changed, 2266 insertions(+), 2242 deletions(-)
diffs (truncated from 7641 to 300 lines):
diff -r 3155a9ccb66b -r 340b6f01d69b src/arch/sparc/asi.cc
--- a/src/arch/sparc/asi.cc Wed Nov 10 00:48:03 2010 -0600
+++ b/src/arch/sparc/asi.cc Thu Nov 11 02:03:58 2010 -0800
@@ -33,277 +33,286 @@
namespace SparcISA
{
- bool AsiIsBlock(ASI asi)
- {
- return
- (asi == ASI_BLK_AIUP) ||
- (asi == ASI_BLK_AIUS) ||
- (asi == ASI_BLK_AIUP_L) ||
- (asi == ASI_BLK_AIUS_L) ||
- (asi == ASI_BLK_P) ||
- (asi == ASI_BLK_S) ||
- (asi == ASI_BLK_PL) ||
- (asi == ASI_BLK_SL);
- }
- bool AsiIsPrimary(ASI asi)
- {
- return
- (asi == ASI_AIUP) ||
- (asi == ASI_BLK_AIUP) ||
- (asi == ASI_AIUP_L) ||
- (asi == ASI_BLK_AIUP_L) ||
- (asi == ASI_LDTX_AIUP) ||
- (asi == ASI_LDTX_AIUP_L) ||
- (asi == ASI_P) ||
- (asi == ASI_PNF) ||
- (asi == ASI_PL) ||
- (asi == ASI_PNFL) ||
- (asi == ASI_PST8_P) ||
- (asi == ASI_PST16_P) ||
- (asi == ASI_PST32_P) ||
- (asi == ASI_PST8_PL) ||
- (asi == ASI_PST16_PL) ||
- (asi == ASI_PST32_PL) ||
- (asi == ASI_FL8_P) ||
- (asi == ASI_FL16_P) ||
- (asi == ASI_FL8_PL) ||
- (asi == ASI_FL16_PL) ||
- (asi == ASI_LDTX_P) ||
- (asi == ASI_LDTX_PL) ||
- (asi == ASI_BLK_P) ||
- (asi == ASI_BLK_PL);
- }
+bool
+asiIsBlock(ASI asi)
+{
+ return asi == ASI_BLK_AIUP ||
+ asi == ASI_BLK_AIUS ||
+ asi == ASI_BLK_AIUP_L ||
+ asi == ASI_BLK_AIUS_L ||
+ asi == ASI_BLK_P ||
+ asi == ASI_BLK_S ||
+ asi == ASI_BLK_PL ||
+ asi == ASI_BLK_SL;
+}
- bool AsiIsSecondary(ASI asi)
- {
- return
- (asi == ASI_AIUS) ||
- (asi == ASI_BLK_AIUS) ||
- (asi == ASI_AIUS_L) ||
- (asi == ASI_BLK_AIUS_L) ||
- (asi == ASI_LDTX_AIUS) ||
- (asi == ASI_LDTX_AIUS_L) ||
- (asi == ASI_S) ||
- (asi == ASI_SNF) ||
- (asi == ASI_SL) ||
- (asi == ASI_SNFL) ||
- (asi == ASI_PST8_S) ||
- (asi == ASI_PST16_S) ||
- (asi == ASI_PST32_S) ||
- (asi == ASI_PST8_SL) ||
- (asi == ASI_PST16_SL) ||
- (asi == ASI_PST32_SL) ||
- (asi == ASI_FL8_S) ||
- (asi == ASI_FL16_S) ||
- (asi == ASI_FL8_SL) ||
- (asi == ASI_FL16_SL) ||
- (asi == ASI_LDTX_S) ||
- (asi == ASI_LDTX_SL) ||
- (asi == ASI_BLK_S) ||
- (asi == ASI_BLK_SL);
- }
+bool
+asiIsPrimary(ASI asi)
+{
+ return asi == ASI_AIUP ||
+ asi == ASI_BLK_AIUP ||
+ asi == ASI_AIUP_L ||
+ asi == ASI_BLK_AIUP_L ||
+ asi == ASI_LDTX_AIUP ||
+ asi == ASI_LDTX_AIUP_L ||
+ asi == ASI_P ||
+ asi == ASI_PNF ||
+ asi == ASI_PL ||
+ asi == ASI_PNFL ||
+ asi == ASI_PST8_P ||
+ asi == ASI_PST16_P ||
+ asi == ASI_PST32_P ||
+ asi == ASI_PST8_PL ||
+ asi == ASI_PST16_PL ||
+ asi == ASI_PST32_PL ||
+ asi == ASI_FL8_P ||
+ asi == ASI_FL16_P ||
+ asi == ASI_FL8_PL ||
+ asi == ASI_FL16_PL ||
+ asi == ASI_LDTX_P ||
+ asi == ASI_LDTX_PL ||
+ asi == ASI_BLK_P ||
+ asi == ASI_BLK_PL;
+}
- bool AsiIsNucleus(ASI asi)
- {
- return
- (asi == ASI_N) ||
- (asi == ASI_NL) ||
- (asi == ASI_LDTX_N) ||
- (asi == ASI_LDTX_NL);
- }
+bool
+asiIsSecondary(ASI asi)
+{
+ return asi == ASI_AIUS ||
+ asi == ASI_BLK_AIUS ||
+ asi == ASI_AIUS_L ||
+ asi == ASI_BLK_AIUS_L ||
+ asi == ASI_LDTX_AIUS ||
+ asi == ASI_LDTX_AIUS_L ||
+ asi == ASI_S ||
+ asi == ASI_SNF ||
+ asi == ASI_SL ||
+ asi == ASI_SNFL ||
+ asi == ASI_PST8_S ||
+ asi == ASI_PST16_S ||
+ asi == ASI_PST32_S ||
+ asi == ASI_PST8_SL ||
+ asi == ASI_PST16_SL ||
+ asi == ASI_PST32_SL ||
+ asi == ASI_FL8_S ||
+ asi == ASI_FL16_S ||
+ asi == ASI_FL8_SL ||
+ asi == ASI_FL16_SL ||
+ asi == ASI_LDTX_S ||
+ asi == ASI_LDTX_SL ||
+ asi == ASI_BLK_S ||
+ asi == ASI_BLK_SL;
+}
- bool AsiIsAsIfUser(ASI asi)
- {
- return
- (asi == ASI_AIUP) ||
- (asi == ASI_AIUS) ||
- (asi == ASI_BLK_AIUP) ||
- (asi == ASI_BLK_AIUS) ||
- (asi == ASI_AIUP_L) ||
- (asi == ASI_AIUS_L) ||
- (asi == ASI_BLK_AIUP_L) ||
- (asi == ASI_BLK_AIUS_L) ||
- (asi == ASI_LDTX_AIUP) ||
- (asi == ASI_LDTX_AIUS) ||
- (asi == ASI_LDTX_AIUP_L) ||
- (asi == ASI_LDTX_AIUS_L);
- }
+bool
+asiIsNucleus(ASI asi)
+{
+ return asi == ASI_N ||
+ asi == ASI_NL ||
+ asi == ASI_LDTX_N ||
+ asi == ASI_LDTX_NL;
+}
- bool AsiIsIO(ASI asi)
- {
- return
- (asi == ASI_REAL_IO) ||
- (asi == ASI_REAL_IO_L);
- }
+bool
+asiIsAsIfUser(ASI asi)
+{
+ return asi == ASI_AIUP ||
+ asi == ASI_AIUS ||
+ asi == ASI_BLK_AIUP ||
+ asi == ASI_BLK_AIUS ||
+ asi == ASI_AIUP_L ||
+ asi == ASI_AIUS_L ||
+ asi == ASI_BLK_AIUP_L ||
+ asi == ASI_BLK_AIUS_L ||
+ asi == ASI_LDTX_AIUP ||
+ asi == ASI_LDTX_AIUS ||
+ asi == ASI_LDTX_AIUP_L ||
+ asi == ASI_LDTX_AIUS_L;
+}
- bool AsiIsReal(ASI asi)
- {
- return
- (asi == ASI_REAL) ||
- (asi == ASI_REAL_IO) ||
- (asi == ASI_REAL_L) ||
- (asi == ASI_REAL_IO_L) ||
- (asi == ASI_LDTX_REAL) ||
- (asi == ASI_LDTX_REAL_L);
- }
+bool
+asiIsIO(ASI asi)
+{
+ return asi == ASI_REAL_IO ||
+ asi == ASI_REAL_IO_L;
+}
- bool AsiIsLittle(ASI asi)
- {
- return
- (asi == ASI_NL) ||
- (asi == ASI_AIUP_L) ||
- (asi == ASI_AIUS_L) ||
- (asi == ASI_REAL_L) ||
- (asi == ASI_REAL_IO_L) ||
- (asi == ASI_BLK_AIUP_L) ||
- (asi == ASI_BLK_AIUS_L) ||
- (asi == ASI_LDTX_AIUP_L) ||
- (asi == ASI_LDTX_AIUS_L) ||
- (asi == ASI_LDTX_REAL_L) ||
- (asi == ASI_LDTX_NL) ||
- (asi == ASI_PL) ||
- (asi == ASI_SL) ||
- (asi == ASI_PNFL) ||
- (asi == ASI_SNFL) ||
- (asi == ASI_PST8_PL) ||
- (asi == ASI_PST8_SL) ||
- (asi == ASI_PST16_PL) ||
- (asi == ASI_PST16_SL) ||
- (asi == ASI_PST32_PL) ||
- (asi == ASI_PST32_SL) ||
- (asi == ASI_FL8_PL) ||
- (asi == ASI_FL8_SL) ||
- (asi == ASI_FL16_PL) ||
- (asi == ASI_FL16_SL) ||
- (asi == ASI_LDTX_PL) ||
- (asi == ASI_LDTX_SL) ||
- (asi == ASI_BLK_PL) ||
- (asi == ASI_BLK_SL) ||
- (asi == ASI_LTX_L);
- }
+bool
+asiIsReal(ASI asi)
+{
+ return asi == ASI_REAL ||
+ asi == ASI_REAL_IO ||
+ asi == ASI_REAL_L ||
+ asi == ASI_REAL_IO_L ||
+ asi == ASI_LDTX_REAL ||
+ asi == ASI_LDTX_REAL_L;
+}
- bool AsiIsTwin(ASI asi)
- {
- return
- (asi >= ASI_LDTX_AIUP &&
+bool
+asiIsLittle(ASI asi)
+{
+ return asi == ASI_NL ||
+ asi == ASI_AIUP_L ||
+ asi == ASI_AIUS_L ||
+ asi == ASI_REAL_L ||
+ asi == ASI_REAL_IO_L ||
+ asi == ASI_BLK_AIUP_L ||
+ asi == ASI_BLK_AIUS_L ||
+ asi == ASI_LDTX_AIUP_L ||
+ asi == ASI_LDTX_AIUS_L ||
+ asi == ASI_LDTX_REAL_L ||
+ asi == ASI_LDTX_NL ||
+ asi == ASI_PL ||
+ asi == ASI_SL ||
+ asi == ASI_PNFL ||
+ asi == ASI_SNFL ||
+ asi == ASI_PST8_PL ||
+ asi == ASI_PST8_SL ||
+ asi == ASI_PST16_PL ||
+ asi == ASI_PST16_SL ||
+ asi == ASI_PST32_PL ||
+ asi == ASI_PST32_SL ||
+ asi == ASI_FL8_PL ||
+ asi == ASI_FL8_SL ||
+ asi == ASI_FL16_PL ||
+ asi == ASI_FL16_SL ||
+ asi == ASI_LDTX_PL ||
+ asi == ASI_LDTX_SL ||
+ asi == ASI_BLK_PL ||
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
