diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-03 00:16:44 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-03 00:16:44 -0500 |
| commit | 2939a7089ad89e38b24f96143dbd3c4292ac0287 (patch) | |
| tree | 70c8435015aa0615f9287ce8de437407087b12e5 /kern | |
| parent | 3d2773195c4d7ecd710ceda19612c1dc228fb1e0 (diff) | |
| download | gem5-2939a7089ad89e38b24f96143dbd3c4292ac0287.tar.xz | |
byte_swap.hh was removed from arch/alpha/, and replaced by sim/byteswap.hh. The new file uses LittleEndianGuest and BigEndianGuest namespaces to allow selecting the appropriate functions.
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_tru64_process.cc:
Added the endianness namespace. This may change.
cpu/exec_context.hh:
Changed the include path for byteswap, and forced LittleEndianness for lack of a better solution.
cpu/o3/alpha_cpu.hh:
Forced LittleEndianness, for lack of a better solution.
cpu/o3/alpha_cpu_impl.hh:
Cleared away some commented out code.
cpu/o3/fetch_impl.hh:
Changed the include patch for byteswap, and forced LittleEndianness for lack of a better solution.
cpu/simple/cpu.cc:
Added an include for byteswap.hh, and fixed the SimpleCPU to LittleEndian. This cpu only does alpha, so that's fine.
dev/disk_image.cc:
Changed the include path of byteswap.hh
kern/freebsd/freebsd_system.cc:
kern/linux/linux_system.cc:
Added an include for byteswap.hh, and forced LittleEndianness for lack of a better solution.
sim/system.cc:
Forced LittleEndianness for lack of a better solution.
--HG--
extra : convert_revision : b95d3e1265a825e04bd77622a3ac09fbac6bd206
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/freebsd/freebsd_system.cc | 5 | ||||
| -rw-r--r-- | kern/linux/linux_system.cc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc index 283713d40..f3fe84e00 100644 --- a/kern/freebsd/freebsd_system.cc +++ b/kern/freebsd/freebsd_system.cc @@ -39,6 +39,7 @@ #include "mem/functional/memory_control.hh" #include "mem/functional/physical.hh" #include "sim/builder.hh" +#include "sim/byteswap.hh" #include "targetarch/vtophys.hh" #define TIMER_FREQUENCY 1193180 @@ -82,8 +83,8 @@ FreebsdSystem::doCalibrateClocks(ExecContext *xc) uint8_t *ppc = physmem->dma_addr(ppc_paddr, sizeof(uint32_t)); uint8_t *timer = physmem->dma_addr(timer_paddr, sizeof(uint32_t)); - *(uint32_t *)ppc = htog((uint32_t)Clock::Frequency); - *(uint32_t *)timer = htog((uint32_t)TIMER_FREQUENCY); + *(uint32_t *)ppc = LittleEndianGuest::htog((uint32_t)Clock::Frequency); + *(uint32_t *)timer = LittleEndianGuest::htog((uint32_t)TIMER_FREQUENCY); } diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc index 1144b9bdd..26a4c0d3e 100644 --- a/kern/linux/linux_system.cc +++ b/kern/linux/linux_system.cc @@ -44,6 +44,7 @@ #include "mem/functional/memory_control.hh" #include "mem/functional/physical.hh" #include "sim/builder.hh" +#include "sim/byteswap.hh" #include "dev/platform.hh" #include "targetarch/arguments.hh" #include "targetarch/vtophys.hh" @@ -100,7 +101,7 @@ LinuxSystem::LinuxSystem(Params *p) char *dp264_mv = (char *)physmem->dma_addr(paddr, sizeof(uint64_t)); if (dp264_mv) { - *(uint32_t*)(dp264_mv+0x18) = htog((uint32_t)127); + *(uint32_t*)(dp264_mv+0x18) = LittleEndianGuest::htog((uint32_t)127); } else panic("could not translate dp264_mv addr\n"); |