projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add in the files to the SConscript for split caches
[gem5.git]
/
cpu
/
static_inst.cc
diff --git
a/cpu/static_inst.cc
b/cpu/static_inst.cc
index 7069d89ec6a78fd35a3f3f170f0fe57148b74768..54bd9914eff169a83fc444ec430b99f674579c03 100644
(file)
--- a/
cpu/static_inst.cc
+++ b/
cpu/static_inst.cc
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003
-2005
The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-28,7
+28,7
@@
#include <iostream>
#include "cpu/static_inst.hh"
#include <iostream>
#include "cpu/static_inst.hh"
-#include "sim/
universe
.hh"
+#include "sim/
root
.hh"
template <class ISA>
StaticInstPtr<ISA> StaticInst<ISA>::nullStaticInstPtr;
template <class ISA>
StaticInstPtr<ISA> StaticInst<ISA>::nullStaticInstPtr;
@@
-68,7
+68,7
@@
StaticInst<AlphaISA>::nullStaticInstPtr;
template <class ISA>
bool
template <class ISA>
bool
-StaticInst<ISA>::hasBranchTarget(Addr pc, ExecContext *xc, Addr &tgt)
+StaticInst<ISA>::hasBranchTarget(Addr pc, ExecContext *xc, Addr &tgt)
const
{
if (isDirectCtrl()) {
tgt = branchTarget(pc);
{
if (isDirectCtrl()) {
tgt = branchTarget(pc);