diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2004-05-11 01:15:18 -0400 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2004-05-11 01:15:18 -0400 |
| commit | a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a (patch) | |
| tree | 06662aecdd919aa0bafb0562fc646465dda5a901 /kern | |
| parent | 3c7071a6be21fc0c87753758fc09ff28890edc99 (diff) | |
| parent | 2cc4fd87eb643c81d37954cbf4a226e78ebd34bc (diff) | |
| download | gem5-a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a.tar.xz | |
first pass at merging m5 with linux
--HG--
extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/tru64/tru64_events.cc | 2 | ||||
| -rw-r--r-- | kern/tru64/tru64_system.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc index a57c01841..17a5e406a 100644 --- a/kern/tru64/tru64_events.cc +++ b/kern/tru64/tru64_events.cc @@ -159,6 +159,6 @@ FnEvent::process(ExecContext *xc) myBin->activate(); xc->system->fnCalls++; DPRINTF(TCPIP, "fnCalls for %s is %d\n", description, - xc->system->fnCalls.val()); + xc->system->fnCalls.value()); xc->system->dumpState(xc); } diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc index f8dda6f84..905ff5df6 100644 --- a/kern/tru64/tru64_system.cc +++ b/kern/tru64/tru64_system.cc @@ -318,7 +318,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tru64System) Param<bool> bin; SimObjectParam<MemoryController *> mem_ctl; SimObjectParam<PhysicalMemory *> physmem; - Param<uint64_t> init_param; + Param<unsigned int> init_param; Param<string> kernel_code; Param<string> console_code; |