projects
/
gem5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b82fa63
)
Fix for slightly mangled merge.
author
Gabe Black
<gblack@eecs.umich.edu>
Wed, 8 Nov 2006 13:25:37 +0000
(08:25 -0500)
committer
Gabe Black
<gblack@eecs.umich.edu>
Wed, 8 Nov 2006 13:25:37 +0000
(08:25 -0500)
--HG--
extra : convert_revision :
1dea04ca222dd423c3d462114bc1c65afa52825d
src/arch/sparc/faults.hh
patch
|
blob
|
history
diff --git
a/src/arch/sparc/faults.hh
b/src/arch/sparc/faults.hh
index 677f8e77ea704cdf43ffb6cc6cd684c15697316f..9cc7739d9b91a2606f93b8fb4f6ced8cf93a5317 100644
(file)
--- a/
src/arch/sparc/faults.hh
+++ b/
src/arch/sparc/faults.hh
@@
-228,9
+228,10
@@
class FillNOther : public EnumeratedFault<FillNOther>
class TrapInstruction : public EnumeratedFault<TrapInstruction>
{
+
public:
- TrapInstruction(uint32_t n
, uint64_t syscall
) :
- EnumeratedFault<TrapInstruction>(n)
, syscall_num(syscall)
{;}
+ TrapInstruction(uint32_t n) :
+ EnumeratedFault<TrapInstruction>(n) {;}
};