diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-08 08:25:37 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-08 08:25:37 -0500 |
| commit | 9375caa3f1ac8ff8fe5bcf3b7de1f51a20b6cd91 (patch) | |
| tree | ff8fcf1ed53f65aa3655c77c2934bb5312f19e9d | |
| parent | b82fa633bb9a9bf72b724dcf202985f37ab1d8b8 (diff) | |
| download | gem5-9375caa3f1ac8ff8fe5bcf3b7de1f51a20b6cd91.tar.xz | |
Fix for slightly mangled merge.
--HG--
extra : convert_revision : 1dea04ca222dd423c3d462114bc1c65afa52825d
| -rw-r--r-- | src/arch/sparc/faults.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/sparc/faults.hh b/src/arch/sparc/faults.hh index 677f8e77e..9cc7739d9 100644 --- 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) {;} }; |