From 5260c7efeff525b74f16258057abf83edb57c79e Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 29 Oct 2019 16:01:17 -0700 Subject: [PATCH] alpha: Convert htog and gtoh to htole and letoh. When within the Alpha arch, we know the guest endianness already. Change-Id: Iee22a33451a06c6e6a5c7d1e8c71f0b00e98ae3f Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22367 Tested-by: kokoro Reviewed-by: Andreas Sandberg Reviewed-by: Brandon Potter Maintainer: Gabe Black --- src/arch/alpha/linux/process.cc | 2 +- src/arch/alpha/linux/system.cc | 2 +- src/arch/alpha/process.cc | 4 ++-- src/arch/alpha/system.cc | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc index 322a5b9fe..1ac53a5a0 100644 --- a/src/arch/alpha/linux/process.cc +++ b/src/arch/alpha/linux/process.cc @@ -141,7 +141,7 @@ osf_setsysinfoFunc(SyscallDesc *desc, int callnum, ThreadContext *tc) // I don't think this exactly matches the HW FPCR fpcr.copyIn(tc->getVirtProxy()); DPRINTFR(SyscallVerbose, "osf_setsysinfo(SSI_IEEE_FP_CONTROL): " - " setting FPCR to 0x%x\n", gtoh(*(uint64_t*)fpcr)); + " setting FPCR to 0x%x\n", letoh(*(uint64_t*)fpcr)); return 0; } diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc index 89d18f6f6..b699d6d1c 100644 --- a/src/arch/alpha/linux/system.cc +++ b/src/arch/alpha/linux/system.cc @@ -110,7 +110,7 @@ LinuxAlphaSystem::initState() * 255 ASNs. */ if (kernelSymtab->findAddress("dp264_mv", addr)) - virtProxy.write(addr + 0x18, LittleEndianGuest::htog((uint32_t)127)); + virtProxy.write(addr + 0x18, htole((uint32_t)127)); else panic("could not find dp264_mv\n"); diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc index 11fa187b1..314769535 100644 --- a/src/arch/alpha/process.cc +++ b/src/arch/alpha/process.cc @@ -148,9 +148,9 @@ AlphaProcess::argsInit(int intSize, int pageSize) // write contents to stack uint64_t argc = argv.size(); if (intSize == 8) - argc = htog((uint64_t)argc); + argc = htole((uint64_t)argc); else if (intSize == 4) - argc = htog((uint32_t)argc); + argc = htole((uint32_t)argc); else panic("Unknown int size"); diff --git a/src/arch/alpha/system.cc b/src/arch/alpha/system.cc index a7a47036a..ca4551f60 100644 --- a/src/arch/alpha/system.cc +++ b/src/arch/alpha/system.cc @@ -129,9 +129,9 @@ AlphaSystem::initState() */ if (consoleSymtab->findAddress("m5_rpb", addr)) { uint64_t data; - data = htog(params()->system_type); + data = htole(params()->system_type); virtProxy.write(addr+0x50, data); - data = htog(params()->system_rev); + data = htole(params()->system_rev); virtProxy.write(addr+0x58, data); } else panic("could not find hwrpb\n"); @@ -212,7 +212,7 @@ AlphaSystem::setAlphaAccess(Addr access) { Addr addr = 0; if (consoleSymtab->findAddress("m5AlphaAccess", addr)) { - virtProxy.write(addr, htog(Phys2K0Seg(access))); + virtProxy.write(addr, htole(Phys2K0Seg(access))); } else { panic("could not find m5AlphaAccess\n"); } -- 2.30.2