diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-03-05 00:34:54 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-03-05 00:34:54 -0500 |
| commit | 20eced3ea07f64e50444c00125012d6641416e4b (patch) | |
| tree | 5a380b1d37c26b842003c84d43f34d1f0126f209 /arch/alpha/freebsd | |
| parent | 9358681756e4ec2cc66062700e8075effebb40dc (diff) | |
| parent | f15e492375e8ecd42a1f0ba7ead68cfeb2b4b673 (diff) | |
| download | gem5-20eced3ea07f64e50444c00125012d6641416e4b.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
Further changes still need to be made to the XC code.
arch/alpha/ev5.cc:
arch/alpha/freebsd/system.cc:
arch/alpha/linux/system.cc:
base/remote_gdb.cc:
cpu/cpu_exec_context.cc:
cpu/cpu_exec_context.hh:
cpu/simple/cpu.cc:
cpu/simple/cpu.hh:
kern/kernel_stats.cc:
sim/pseudo_inst.cc:
Hand merge.
--HG--
rename : kern/freebsd/freebsd_system.cc => arch/alpha/freebsd/system.cc
rename : kern/linux/linux_system.cc => arch/alpha/linux/system.cc
rename : kern/linux/linux_threadinfo.hh => arch/alpha/linux/threadinfo.hh
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux_process.cc
rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64_process.cc
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : c1fe71fdd87d1fcd376f4feec69fc3fa29152e3e
Diffstat (limited to 'arch/alpha/freebsd')
| -rw-r--r-- | arch/alpha/freebsd/system.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/alpha/freebsd/system.cc b/arch/alpha/freebsd/system.cc index 681d4ad46..e32053afd 100644 --- a/arch/alpha/freebsd/system.cc +++ b/arch/alpha/freebsd/system.cc @@ -39,8 +39,8 @@ #include "cpu/exec_context.hh" #include "mem/functional/memory_control.hh" #include "mem/functional/physical.hh" -#include "sim/builder.hh" #include "arch/isa_traits.hh" +#include "sim/builder.hh" #include "sim/byteswap.hh" #include "arch/vtophys.hh" @@ -77,8 +77,8 @@ FreebsdAlphaSystem::doCalibrateClocks(ExecContext *xc) Addr ppc_paddr = 0; Addr timer_paddr = 0; - ppc_vaddr = (Addr)xc->regs.intRegFile[ArgumentReg1]; - timer_vaddr = (Addr)xc->regs.intRegFile[ArgumentReg2]; + ppc_vaddr = (Addr)xc->readIntReg(ArgumentReg1); + timer_vaddr = (Addr)xc->readIntReg(ArgumentReg2); ppc_paddr = vtophys(physmem, ppc_vaddr); timer_paddr = vtophys(physmem, timer_vaddr); @@ -95,7 +95,7 @@ void FreebsdAlphaSystem::SkipCalibrateClocksEvent::process(ExecContext *xc) { SkipFuncEvent::process(xc); - ((FreebsdAlphaSystem *)xc->system)->doCalibrateClocks(xc); + ((FreebsdAlphaSystem *)xc->getSystemPtr())->doCalibrateClocks(xc); } |