derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch,sim: Rename GuestABI namespace as guest_abi

Browse Source 
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.

::GuestABI became ::guest_abi.

Change-Id: I68700ef63479f1bb3eeab044b29dc09d86424608
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45433
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
Maintainer: Gabe Black <gabe.black@gmail.com>
This commit is contained in:
Daniel R. Carvalho
2021-05-07 14:52:15 -03:00
committed by Daniel Carvalho
parent b8ff106024
commit 0c8bd5013a
29 changed files with 151 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/arch/arm/aapcs32.hh
View File

@@ -63,7 +63,8 @@ struct Aapcs32
};
};
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
/*
@@ -355,7 +356,7 @@ struct Argument<Aapcs32, Composite, typename std::enable_if_t<
}
};
} // namespace GuestABI
} // namespace guest_abi
/*
@@ -426,7 +427,8 @@ struct Aapcs32Vfp : public Aapcs32
};
};
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
/*
@@ -634,6 +636,6 @@ struct Argument<Aapcs32Vfp, VarArgs<Types...>>
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_ARM_AAPCS32_HH__

5
src/arch/arm/aapcs64.hh
View File

@@ -63,7 +63,8 @@ struct Aapcs64
};
};
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
/*
@@ -420,6 +421,6 @@ struct Result<Aapcs64, Composite, typename std::enable_if_t<
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_ARM_AAPCS64_HH__

88
src/arch/arm/aapcs64.test.cc
View File

@@ -40,41 +40,41 @@ TEST(Aapcs64, IsAapcs64ShortVector)
using EightLongFloat = float[2];
using SixteenLongFloat = double[2];
EXPECT_FALSE(GuestABI::IsAapcs64ShortVector<Scalar>::value);
EXPECT_FALSE(GuestABI::IsAapcs64ShortVector<TooShort>::value);
EXPECT_FALSE(GuestABI::IsAapcs64ShortVector<TooLong>::value);
EXPECT_FALSE(GuestABI::IsAapcs64ShortVector<TooLongFloat>::value);
EXPECT_FALSE(GuestABI::IsAapcs64ShortVector<void>::value);
EXPECT_FALSE(guest_abi::IsAapcs64ShortVector<Scalar>::value);
EXPECT_FALSE(guest_abi::IsAapcs64ShortVector<TooShort>::value);
EXPECT_FALSE(guest_abi::IsAapcs64ShortVector<TooLong>::value);
EXPECT_FALSE(guest_abi::IsAapcs64ShortVector<TooLongFloat>::value);
EXPECT_FALSE(guest_abi::IsAapcs64ShortVector<void>::value);
EXPECT_TRUE(GuestABI::IsAapcs64ShortVector<EightLong>::value);
EXPECT_TRUE(GuestABI::IsAapcs64ShortVector<SixteenLong>::value);
EXPECT_TRUE(GuestABI::IsAapcs64ShortVector<EightLongFloat>::value);
EXPECT_TRUE(GuestABI::IsAapcs64ShortVector<SixteenLongFloat>::value);
EXPECT_TRUE(guest_abi::IsAapcs64ShortVector<EightLong>::value);
EXPECT_TRUE(guest_abi::IsAapcs64ShortVector<SixteenLong>::value);
EXPECT_TRUE(guest_abi::IsAapcs64ShortVector<EightLongFloat>::value);
EXPECT_TRUE(guest_abi::IsAapcs64ShortVector<SixteenLongFloat>::value);
}
TEST(Aapcs64, IsAapcs64Hfa)
{
// Accept floating point arrays with up to 4 members.
EXPECT_TRUE(GuestABI::IsAapcs64Hfa<float[1]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hfa<float[2]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hfa<float[3]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hfa<float[4]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hfa<float[1]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hfa<float[2]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hfa<float[3]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hfa<float[4]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hfa<double[1]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hfa<double[2]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hfa<double[3]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hfa<double[4]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hfa<double[1]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hfa<double[2]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hfa<double[3]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hfa<double[4]>::value);
// Too many members.
EXPECT_FALSE(GuestABI::IsAapcs64Hfa<float[5]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hfa<double[5]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hfa<float[5]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hfa<double[5]>::value);
// Wrong type of members, or not arrays.
EXPECT_FALSE(GuestABI::IsAapcs64Hfa<int32_t[3]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hfa<float>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hfa<int32_t[3]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hfa<float>::value);
struct Struct {};
EXPECT_FALSE(GuestABI::IsAapcs64Hfa<Struct>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hfa<void>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hfa<Struct>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hfa<void>::value);
}
TEST(Aapcs64, IsAapcs64Hva)
@@ -83,36 +83,36 @@ TEST(Aapcs64, IsAapcs64Hva)
using SvaTiny = uint8_t[16];
using SvaFloat = float[2];
EXPECT_TRUE(GuestABI::IsAapcs64Hva<SvaInt[3]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hva<SvaInt[4]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hva<SvaInt[5]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hva<SvaInt[3]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hva<SvaInt[4]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hva<SvaInt[5]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hva<SvaFloat[3]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hva<SvaFloat[4]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hva<SvaFloat[5]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hva<SvaFloat[3]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hva<SvaFloat[4]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hva<SvaFloat[5]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hva<SvaTiny[3]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hva<SvaTiny[4]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hva<SvaTiny[5]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hva<SvaTiny[3]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hva<SvaTiny[4]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hva<SvaTiny[5]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hva<uint64_t>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hva<uint64_t[1]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hva<SvaTiny>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hva<void>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hva<float>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hva<uint64_t>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hva<uint64_t[1]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hva<SvaTiny>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hva<void>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hva<float>::value);
}
TEST(Aapcs64, IsAapcs64Hxa)
{
using SvaInt = uint32_t[2];
EXPECT_TRUE(GuestABI::IsAapcs64Hxa<SvaInt[4]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hxa<SvaInt[5]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hxa<SvaInt[4]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hxa<SvaInt[5]>::value);
EXPECT_TRUE(GuestABI::IsAapcs64Hxa<float[4]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hxa<float[5]>::value);
EXPECT_TRUE(guest_abi::IsAapcs64Hxa<float[4]>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hxa<float[5]>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hxa<SvaInt>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hxa<uint64_t>::value);
EXPECT_FALSE(GuestABI::IsAapcs64Hxa<void>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hxa<SvaInt>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hxa<uint64_t>::value);
EXPECT_FALSE(guest_abi::IsAapcs64Hxa<void>::value);
}

5
src/arch/arm/freebsd/se_workload.hh
View File

@@ -64,7 +64,8 @@ class EmuFreebsd : public SEWorkload
} // namespace ArmISA
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename ABI>
@@ -92,6 +93,6 @@ struct Result<ABI, SyscallReturn,
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_ARM_FREEBSD_SE_WORKLOAD_HH__

5
src/arch/arm/linux/se_workload.hh
View File

@@ -57,7 +57,8 @@ class EmuLinux : public SEWorkload
} // namespace ArmISA
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename ABI>
@@ -77,6 +78,6 @@ struct Result<ABI, SyscallReturn,
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_ARM_LINUX_SE_WORKLOAD_HH__

5
src/arch/arm/reg_abi.hh
View File

@@ -48,7 +48,8 @@ struct RegABI64 : public GenericSyscallABI64
} // namespace ArmISA
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename ABI, typename Arg>
@@ -72,6 +73,6 @@ struct Argument<ABI, Arg,
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_ARM_REG_ABI_HH__

5
src/arch/arm/semihosting.cc
View File

@@ -702,7 +702,8 @@ struct SemiPseudoAbi64 : public ArmSemihosting::Abi64
};
};
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
// Handle arguments the same as for semihosting operations. Skipping the first
@@ -716,7 +717,7 @@ struct Argument<SemiPseudoAbi64, T> :
public Argument<ArmSemihosting::Abi64, T>
{};
} // namespace GuestABI
} // namespace guest_abi
ArmSemihosting::RetErrno
ArmSemihosting::callGem5PseudoOp32(ThreadContext *tc, uint32_t encoded_func)

5
src/arch/arm/semihosting.hh
View File

@@ -595,7 +595,8 @@ class ArmSemihosting : public SimObject
std::ostream &operator << (
std::ostream &os, const ArmSemihosting::InPlaceArg &ipa);
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename Arg>
@@ -655,6 +656,6 @@ struct Result<ArmSemihosting::Abi64, ArmSemihosting::RetErrno>
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_ARM_SEMIHOSTING_HH__

5
src/arch/mips/se_workload.hh
View File

@@ -54,7 +54,8 @@ class SEWorkload : public ::SEWorkload
} // namespace MipsISA
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <>
@@ -80,6 +81,6 @@ struct Result<MipsISA::SEWorkload::SyscallABI, SyscallReturn>
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_MIPS_SE_WORKLOAD_HH__

5
src/arch/power/se_workload.hh
View File

@@ -54,7 +54,8 @@ class SEWorkload : public ::SEWorkload
} // namespace PowerISA
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <>
@@ -77,6 +78,6 @@ struct Result<PowerISA::SEWorkload::SyscallABI, SyscallReturn>
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_POWER_SE_WORKLOAD_HH__

5
src/arch/riscv/se_workload.hh
View File

@@ -52,7 +52,8 @@ class SEWorkload : public ::SEWorkload
} // namespace RiscvISA
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <>
@@ -74,6 +75,6 @@ struct Result<RiscvISA::SEWorkload::SyscallABI, SyscallReturn>
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_RISCV_SE_WORKLOAD_HH__

5
src/arch/sparc/pseudo_inst_abi.hh
View File

@@ -37,7 +37,8 @@ struct SparcPseudoInstABI
using State = int;
};
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename T>
@@ -64,6 +65,6 @@ struct Argument<SparcPseudoInstABI, uint64_t>
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_SPARC_PSEUDO_INST_ABI_HH__

5
src/arch/sparc/se_workload.hh
View File

@@ -66,7 +66,8 @@ class SEWorkload : public ::SEWorkload
} // namespace SparcISA
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename ABI>
@@ -122,6 +123,6 @@ struct Argument<SparcISA::SEWorkload::SyscallABI32, Arg,
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_SPARC_SE_WORKLOAD_HH__

5
src/arch/x86/linux/linux.hh
View File

@@ -69,7 +69,8 @@ class X86Linux : public Linux
class SyscallABI {};
};
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename ABI>
@@ -87,7 +88,7 @@ struct Result<ABI, SyscallReturn,
}
};
};
} // namespace guest_abi
class X86Linux64 : public X86Linux
{

5
src/arch/x86/linux/se_workload.hh
View File

@@ -82,7 +82,8 @@ class EmuLinux : public SEWorkload
} // namespace X86ISA
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename Arg>
@@ -103,6 +104,6 @@ struct Argument<X86ISA::EmuLinux::SyscallABI32, Arg,
}
};
} // namespace GuestABI
} // namespace guest_abi
#endif // __ARCH_X86_LINUX_SE_WORKLOAD_HH__

5
src/arch/x86/pseudo_inst_abi.hh
View File

@@ -43,7 +43,8 @@ struct X86PseudoInstABI
using State = int;
};
namespace GuestABI
GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
template <typename T>
@@ -81,4 +82,4 @@ struct Argument<X86PseudoInstABI, uint64_t>
}
};
} // namespace GuestABI
} // namespace guest_abi