diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
| commit | 0e4a80df1a471671b6ef7003e29124b6835ade42 (patch) | |
| tree | 1d2c44d8c3462dd94c0fbf6e4f149e026c901aa8 /kern/tru64 | |
| parent | a48c24b61eedf580645ff0294b225d1e69a9444b (diff) | |
| parent | 463aa6d49d49ba9c383f07207df57bad75c58ec9 (diff) | |
| download | gem5-0e4a80df1a471671b6ef7003e29124b6835ade42.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348
Diffstat (limited to 'kern/tru64')
| -rw-r--r-- | kern/tru64/dump_mbuf.cc | 2 | ||||
| -rw-r--r-- | kern/tru64/mbuf.hh | 22 | ||||
| -rw-r--r-- | kern/tru64/tru64_events.cc | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/kern/tru64/dump_mbuf.cc b/kern/tru64/dump_mbuf.cc index 85cb4de96..efdaed62d 100644 --- a/kern/tru64/dump_mbuf.cc +++ b/kern/tru64/dump_mbuf.cc @@ -38,6 +38,8 @@ #include "arch/isa_traits.hh" #include "targetarch/vtophys.hh" +using namespace TheISA; + namespace tru64 { void diff --git a/kern/tru64/mbuf.hh b/kern/tru64/mbuf.hh index 93424858f..7b84b5e10 100644 --- a/kern/tru64/mbuf.hh +++ b/kern/tru64/mbuf.hh @@ -35,35 +35,35 @@ namespace tru64 { struct m_hdr { - Addr mh_next; // 0x00 - Addr mh_nextpkt; // 0x08 - Addr mh_data; // 0x10 + TheISA::Addr mh_next; // 0x00 + TheISA::Addr mh_nextpkt; // 0x08 + TheISA::Addr mh_data; // 0x10 int32_t mh_len; // 0x18 int32_t mh_type; // 0x1C int32_t mh_flags; // 0x20 int32_t mh_pad0; // 0x24 - Addr mh_foo[4]; // 0x28, 0x30, 0x38, 0x40 + TheISA::Addr mh_foo[4]; // 0x28, 0x30, 0x38, 0x40 }; struct pkthdr { int32_t len; int32_t protocolSum; - Addr rcvif; + TheISA::Addr rcvif; }; struct m_ext { - Addr ext_buf; // 0x00 - Addr ext_free; // 0x08 + TheISA::Addr ext_buf; // 0x00 + TheISA::Addr ext_free; // 0x08 uint32_t ext_size; // 0x10 uint32_t ext_pad0; // 0x14 - Addr ext_arg; // 0x18 + TheISA::Addr ext_arg; // 0x18 struct ext_refq { - Addr forw, back; // 0x20, 0x28 + TheISA::Addr forw, back; // 0x20, 0x28 } ext_ref; - Addr uiomove_f; // 0x30 + TheISA::Addr uiomove_f; // 0x30 int32_t protocolSum; // 0x38 int32_t bytesSummed; // 0x3C - Addr checksum; // 0x40 + TheISA::Addr checksum; // 0x40 }; struct mbuf { diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc index d769aab0f..2fe6a2dc4 100644 --- a/kern/tru64/tru64_events.cc +++ b/kern/tru64/tru64_events.cc @@ -36,6 +36,8 @@ #include "targetarch/arguments.hh" #include "arch/isa_traits.hh" +using namespace TheISA; + //void SkipFuncEvent::process(ExecContext *xc); void |