Consolidate cell format defines

When cross-compiling ppc64 from ppc (native larger than host),
%llx cell format leads to warnings.

The cell format depends solely on the cell type definition,
not on pointer sizes. Under the present assumption that native
smaller than host bitwidth occurs when cross-compiling a 32-bit
target from 64-bit host, we can reuse the definitions from the
equality path for all bitwidths.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>


git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@940 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Andreas Färber
2010-10-31 16:54:58 +00:00
committed by Andreas Färber
parent 52d7516592
commit 595b99dc36

View File

@@ -102,7 +102,6 @@
/* bit width handling */
#ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH
#if BITS==32
#define FMT_CELL_x "x"
#define FMT_CELL_d "d"
@@ -110,21 +109,16 @@
#define FMT_CELL_x "llx"
#define FMT_CELL_d "lld"
#endif
#endif
#ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH
extern unsigned long base_address;
#define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address))
#define cell2pointer(x) ((u8 *)(((unsigned long)(x))+base_address))
#define FMT_CELL_x "x"
#define FMT_CELL_d "d"
#endif
#ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH
#define pointer2cell(x) ((ucell)(unsigned long)(x))
#define cell2pointer(x) ((u8 *)((unsigned long)(x)&0xFFFFFFFFUL))
#define FMT_CELL_x "llx"
#define FMT_CELL_d "lld"
#endif
#endif