From 9f55bb847863b4187db4f14726985ff3c0cc7672 Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Thu, 6 May 2021 20:19:18 -0300 Subject: [PATCH] base: Rename Loader namespace as loader As part of recent decisions regarding namespace naming conventions, all namespaces will be changed to snake case. ::Loader became ::loader. Change-Id: Ifddf11ab4d5d7358032fbc523bc923c0a9feedbd Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45424 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/arch/arm/freebsd/fs_workload.cc | 4 +- src/arch/arm/freebsd/se_workload.cc | 10 +-- src/arch/arm/fs_workload.cc | 12 +-- src/arch/arm/fs_workload.hh | 14 +-- src/arch/arm/insts/branch.cc | 6 +- src/arch/arm/insts/branch.hh | 6 +- src/arch/arm/insts/branch64.cc | 20 ++--- src/arch/arm/insts/branch64.hh | 20 ++--- src/arch/arm/insts/data64.cc | 26 +++--- src/arch/arm/insts/data64.hh | 26 +++--- src/arch/arm/insts/macromem.cc | 16 ++-- src/arch/arm/insts/macromem.hh | 16 ++-- src/arch/arm/insts/mem.cc | 4 +- src/arch/arm/insts/mem.hh | 10 +-- src/arch/arm/insts/mem64.cc | 22 ++--- src/arch/arm/insts/mem64.hh | 22 ++--- src/arch/arm/insts/misc.cc | 44 ++++----- src/arch/arm/insts/misc.hh | 44 ++++----- src/arch/arm/insts/misc64.cc | 18 ++-- src/arch/arm/insts/misc64.hh | 18 ++-- src/arch/arm/insts/pred_inst.cc | 12 +-- src/arch/arm/insts/pred_inst.hh | 12 +-- src/arch/arm/insts/pseudo.cc | 6 +- src/arch/arm/insts/pseudo.hh | 6 +- src/arch/arm/insts/static_inst.cc | 6 +- src/arch/arm/insts/static_inst.hh | 6 +- src/arch/arm/insts/sve.cc | 100 ++++++++++----------- src/arch/arm/insts/sve.hh | 100 ++++++++++----------- src/arch/arm/insts/sve_macromem.hh | 12 +-- src/arch/arm/insts/sve_mem.cc | 8 +- src/arch/arm/insts/sve_mem.hh | 8 +- src/arch/arm/insts/tme64.cc | 6 +- src/arch/arm/insts/tme64.hh | 6 +- src/arch/arm/insts/vfp.cc | 18 ++-- src/arch/arm/insts/vfp.hh | 18 ++-- src/arch/arm/isa/templates/sve_mem.isa | 16 ++-- src/arch/arm/linux/fs_workload.cc | 8 +- src/arch/arm/linux/process.hh | 4 +- src/arch/arm/linux/se_workload.cc | 16 ++-- src/arch/arm/process.cc | 16 ++-- src/arch/arm/process.hh | 14 +-- src/arch/arm/se_workload.hh | 2 +- src/arch/arm/system.cc | 2 +- src/arch/mips/isa/base.isa | 4 +- src/arch/mips/isa/formats/branch.isa | 18 ++-- src/arch/mips/isa/formats/control.isa | 12 +-- src/arch/mips/isa/formats/fp.isa | 4 +- src/arch/mips/isa/formats/int.isa | 24 ++--- src/arch/mips/isa/formats/mem.isa | 8 +- src/arch/mips/isa/formats/mt.isa | 4 +- src/arch/mips/isa/formats/noop.isa | 4 +- src/arch/mips/isa/formats/tlbop.isa | 4 +- src/arch/mips/isa/formats/trap.isa | 8 +- src/arch/mips/isa/formats/unimp.isa | 20 ++--- src/arch/mips/isa/formats/unknown.isa | 4 +- src/arch/mips/linux/se_workload.cc | 10 +-- src/arch/mips/process.cc | 4 +- src/arch/mips/process.hh | 7 +- src/arch/mips/se_workload.hh | 2 +- src/arch/power/insts/branch.cc | 12 +-- src/arch/power/insts/branch.hh | 10 +-- src/arch/power/insts/condition.cc | 4 +- src/arch/power/insts/condition.hh | 4 +- src/arch/power/insts/floating.cc | 2 +- src/arch/power/insts/floating.hh | 2 +- src/arch/power/insts/integer.cc | 8 +- src/arch/power/insts/integer.hh | 8 +- src/arch/power/insts/mem.cc | 4 +- src/arch/power/insts/mem.hh | 4 +- src/arch/power/insts/misc.cc | 2 +- src/arch/power/insts/misc.hh | 2 +- src/arch/power/insts/static_inst.cc | 2 +- src/arch/power/insts/static_inst.hh | 2 +- src/arch/power/isa/formats/unimp.isa | 8 +- src/arch/power/isa/formats/unknown.isa | 4 +- src/arch/power/linux/se_workload.cc | 10 +-- src/arch/power/process.cc | 4 +- src/arch/power/process.hh | 7 +- src/arch/power/se_workload.hh | 2 +- src/arch/riscv/bare_metal/fs_workload.cc | 2 +- src/arch/riscv/bare_metal/fs_workload.hh | 11 +-- src/arch/riscv/insts/amo.cc | 14 +-- src/arch/riscv/insts/amo.hh | 14 +-- src/arch/riscv/insts/compressed.cc | 2 +- src/arch/riscv/insts/compressed.hh | 2 +- src/arch/riscv/insts/mem.cc | 4 +- src/arch/riscv/insts/mem.hh | 4 +- src/arch/riscv/insts/pseudo.hh | 2 +- src/arch/riscv/insts/standard.cc | 6 +- src/arch/riscv/insts/standard.hh | 6 +- src/arch/riscv/insts/unknown.hh | 2 +- src/arch/riscv/isa/formats/compressed.isa | 4 +- src/arch/riscv/isa/formats/standard.isa | 16 ++-- src/arch/riscv/linux/fs_workload.cc | 2 +- src/arch/riscv/linux/se_workload.cc | 12 +-- src/arch/riscv/process.cc | 8 +- src/arch/riscv/process.hh | 11 +-- src/arch/riscv/se_workload.hh | 2 +- src/arch/sparc/fs_workload.hh | 8 +- src/arch/sparc/insts/blockmem.cc | 4 +- src/arch/sparc/insts/blockmem.hh | 4 +- src/arch/sparc/insts/branch.cc | 8 +- src/arch/sparc/insts/branch.hh | 6 +- src/arch/sparc/insts/integer.cc | 10 +-- src/arch/sparc/insts/integer.hh | 10 +-- src/arch/sparc/insts/mem.cc | 4 +- src/arch/sparc/insts/mem.hh | 4 +- src/arch/sparc/insts/micro.cc | 2 +- src/arch/sparc/insts/micro.hh | 2 +- src/arch/sparc/insts/nop.cc | 4 +- src/arch/sparc/insts/nop.hh | 2 +- src/arch/sparc/insts/priv.cc | 8 +- src/arch/sparc/insts/priv.hh | 8 +- src/arch/sparc/insts/static_inst.cc | 2 +- src/arch/sparc/insts/static_inst.hh | 2 +- src/arch/sparc/insts/trap.cc | 2 +- src/arch/sparc/insts/trap.hh | 4 +- src/arch/sparc/insts/unimp.hh | 4 +- src/arch/sparc/insts/unknown.hh | 2 +- src/arch/sparc/linux/se_workload.cc | 12 +-- src/arch/sparc/linux/se_workload.hh | 2 +- src/arch/sparc/process.cc | 4 +- src/arch/sparc/process.hh | 6 +- src/arch/x86/faults.cc | 2 +- src/arch/x86/fs_workload.cc | 2 +- src/arch/x86/insts/macroop.hh | 2 +- src/arch/x86/insts/microdebug.hh | 2 +- src/arch/x86/insts/microop.hh | 2 +- src/arch/x86/insts/microop_args.hh | 2 +- src/arch/x86/insts/static_inst.cc | 2 +- src/arch/x86/insts/static_inst.hh | 2 +- src/arch/x86/isa/formats/cpuid.isa | 4 +- src/arch/x86/isa/formats/monitor_mwait.isa | 8 +- src/arch/x86/isa/formats/nop.isa | 4 +- src/arch/x86/isa/formats/syscall.isa | 4 +- src/arch/x86/isa/formats/unimp.isa | 8 +- src/arch/x86/isa/formats/unknown.isa | 4 +- src/arch/x86/isa/macroop.isa | 4 +- src/arch/x86/linux/se_workload.cc | 12 +-- src/arch/x86/linux/se_workload.hh | 2 +- src/arch/x86/process.cc | 8 +- src/arch/x86/process.hh | 6 +- src/arch/x86/remote_gdb.cc | 8 +- src/base/loader/dtb_file.cc | 5 +- src/base/loader/dtb_file.hh | 6 +- src/base/loader/elf_object.cc | 13 +-- src/base/loader/elf_object.hh | 6 +- src/base/loader/image_file.hh | 6 +- src/base/loader/image_file_data.cc | 5 +- src/base/loader/image_file_data.hh | 7 +- src/base/loader/image_file_data.test.cc | 2 +- src/base/loader/memory_image.cc | 5 +- src/base/loader/memory_image.hh | 6 +- src/base/loader/object_file.cc | 5 +- src/base/loader/object_file.hh | 6 +- src/base/loader/raw_image.hh | 6 +- src/base/loader/symtab.cc | 5 +- src/base/loader/symtab.hh | 6 +- src/cpu/base.cc | 6 +- src/cpu/exetrace.cc | 8 +- src/cpu/nop_static_inst.cc | 2 +- src/cpu/profile.cc | 4 +- src/cpu/profile.hh | 13 +-- src/cpu/static_inst.cc | 2 +- src/cpu/static_inst.hh | 9 +- src/mem/abstract_mem.cc | 6 +- src/python/pybind11/core.cc | 2 +- src/python/pybind11/object_file.cc | 16 ++-- src/sim/kernel_workload.cc | 8 +- src/sim/kernel_workload.hh | 14 +-- src/sim/process.cc | 16 ++-- src/sim/process.hh | 19 ++-- src/sim/pseudo_inst.cc | 8 +- src/sim/se_workload.hh | 6 +- src/sim/syscall_emul.hh | 4 +- src/sim/workload.hh | 12 +-- 176 files changed, 804 insertions(+), 774 deletions(-) diff --git a/src/arch/arm/freebsd/fs_workload.cc b/src/arch/arm/freebsd/fs_workload.cc index d6e9533811..d2cc750ebf 100644 --- a/src/arch/arm/freebsd/fs_workload.cc +++ b/src/arch/arm/freebsd/fs_workload.cc @@ -81,7 +81,7 @@ FsFreebsd::initState() if (params().early_kernel_symbols) { auto phys_globals = kernelObj->symtab().globals()->mask(_loadAddrMask); kernelSymtab.insert(*phys_globals); - Loader::debugSymbolTable.insert(*phys_globals); + loader::debugSymbolTable.insert(*phys_globals); } // Check if the kernel image has a symbol that tells us it supports @@ -95,7 +95,7 @@ FsFreebsd::initState() inform("Loading DTB file: %s at address %#x\n", params().dtb_filename, params().dtb_addr); - auto *dtb_file = new ::Loader::DtbFile(params().dtb_filename); + auto *dtb_file = new loader::DtbFile(params().dtb_filename); warn_if(!dtb_file->addBootCmdLine(commandLine.c_str(), commandLine.size()), "Couldn't append bootargs to DTB file: %s", diff --git a/src/arch/arm/freebsd/se_workload.cc b/src/arch/arm/freebsd/se_workload.cc index 5e52485eee..70eab8ab80 100644 --- a/src/arch/arm/freebsd/se_workload.cc +++ b/src/arch/arm/freebsd/se_workload.cc @@ -51,20 +51,20 @@ class FreebsdLoader : public Process::Loader { public: Process * - load(const ProcessParams ¶ms, ::Loader::ObjectFile *obj) override + load(const ProcessParams ¶ms, loader::ObjectFile *obj) override { auto arch = obj->getArch(); auto opsys = obj->getOpSys(); - if (arch != ::Loader::Arm && arch != ::Loader::Thumb && - arch != ::Loader::Arm64) { + if (arch != loader::Arm && arch != loader::Thumb && + arch != loader::Arm64) { return nullptr; } - if (opsys != ::Loader::FreeBSD) + if (opsys != loader::FreeBSD) return nullptr; - if (arch == ::Loader::Arm64) + if (arch == loader::Arm64) return new ArmProcess64(params, obj, arch); else return new ArmProcess32(params, obj, arch); diff --git a/src/arch/arm/fs_workload.cc b/src/arch/arm/fs_workload.cc index a731a8100d..21ca993ac3 100644 --- a/src/arch/arm/fs_workload.cc +++ b/src/arch/arm/fs_workload.cc @@ -78,8 +78,8 @@ FsWorkload::FsWorkload(const Params &p) : KernelWorkload(p) bootLoaders.reserve(p.boot_loader.size()); for (const auto &bl : p.boot_loader) { - std::unique_ptr bl_obj; - bl_obj.reset(Loader::createObjectFile(bl)); + std::unique_ptr bl_obj; + bl_obj.reset(loader::createObjectFile(bl)); fatal_if(!bl_obj, "Could not read bootloader: %s", bl); bootLoaders.emplace_back(std::move(bl_obj)); @@ -91,7 +91,7 @@ FsWorkload::FsWorkload(const Params &p) : KernelWorkload(p) "Can't find a matching boot loader / kernel combination!"); if (bootldr) - Loader::debugSymbolTable.insert(*bootldr->symtab().globals()); + loader::debugSymbolTable.insert(*bootldr->symtab().globals()); } void @@ -130,7 +130,7 @@ FsWorkload::initState() tc->setIntReg(3, kernelEntry); if (is_gic_v2) tc->setIntReg(4, arm_sys->params().gic_cpu_addr); - if (getArch() == Loader::Arm) + if (getArch() == loader::Arm) tc->setIntReg(5, params().cpu_release_addr); } inform("Using kernel entry physical address at %#x\n", kernelEntry); @@ -141,8 +141,8 @@ FsWorkload::initState() } } - Loader::ObjectFile * -FsWorkload::getBootLoader(Loader::ObjectFile *const obj) + loader::ObjectFile * +FsWorkload::getBootLoader(loader::ObjectFile *const obj) { if (obj) { for (auto &bl : bootLoaders) { diff --git a/src/arch/arm/fs_workload.hh b/src/arch/arm/fs_workload.hh index c85f867be8..b3d7f48758 100644 --- a/src/arch/arm/fs_workload.hh +++ b/src/arch/arm/fs_workload.hh @@ -66,12 +66,12 @@ class FsWorkload : public KernelWorkload { protected: /** Bootloaders */ - std::vector> bootLoaders; + std::vector> bootLoaders; /** * Pointer to the bootloader object */ - Loader::ObjectFile *bootldr = nullptr; + loader::ObjectFile *bootldr = nullptr; /** * This differs from entry since it takes into account where @@ -87,14 +87,14 @@ class FsWorkload : public KernelWorkload * @return Pointer to boot loader ObjectFile or nullptr if there * is no matching boot loader. */ - Loader::ObjectFile *getBootLoader(Loader::ObjectFile *const obj); + loader::ObjectFile *getBootLoader(loader::ObjectFile *const obj); template