Generic headers should only contain arch specific definitions if really needed, which is not the case for the RISC-V based opcode immediate parsing constants, so move them out of BasePeCoffLibInternals.h.
Signed-off-by: Ard Biesheuvel <a...@kernel.org> --- MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h | 9 --------- MdePkg/Library/BasePeCoffLib/RiscV/PeCoffLoaderEx.c | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h b/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h index aa86a54850c6..4a43ec236529 100644 --- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h +++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h @@ -17,15 +17,6 @@ #include <Library/PeCoffExtraActionLib.h> #include <IndustryStandard/PeImage.h> -// -// Macro definitions for RISC-V architecture. -// -#define RV_X(x, s, n) (((x) >> (s)) & ((1<<(n))-1)) -#define RISCV_IMM_BITS 12 -#define RISCV_IMM_REACH (1LL<<RISCV_IMM_BITS) -#define RISCV_CONST_HIGH_PART(VALUE) \ - (((VALUE) + (RISCV_IMM_REACH/2)) & ~(RISCV_IMM_REACH-1)) - /** Performs an Itanium-based specific relocation fixup and is a no-op on other instruction sets. diff --git a/MdePkg/Library/BasePeCoffLib/RiscV/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/RiscV/PeCoffLoaderEx.c index adbfe9ccf580..71daf7fe4554 100644 --- a/MdePkg/Library/BasePeCoffLib/RiscV/PeCoffLoaderEx.c +++ b/MdePkg/Library/BasePeCoffLib/RiscV/PeCoffLoaderEx.c @@ -7,6 +7,15 @@ #include "BasePeCoffLibInternals.h" #include <Library/BaseLib.h> +// +// Macro definitions for RISC-V architecture. +// +#define RV_X(x, s, n) (((x) >> (s)) & ((1<<(n))-1)) +#define RISCV_IMM_BITS 12 +#define RISCV_IMM_REACH (1LL<<RISCV_IMM_BITS) +#define RISCV_CONST_HIGH_PART(VALUE) \ + (((VALUE) + (RISCV_IMM_REACH/2)) & ~(RISCV_IMM_REACH-1)) + /** Performs an RISC-V specific relocation fixup and is a no-op on other instruction sets. -- 2.39.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#99569): https://edk2.groups.io/g/devel/message/99569 Mute This Topic: https://groups.io/mt/96721183/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
