system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stand/ficl 64-bit compatibility

Browse source 
Currently, the only thing that prevents a functioning 64-bit FICL build is
a few integer types that were intended to be fixed-width.

Changing them to C99 integer types allows building a functioning 64-bit
FICL.

While this isn't applicable to the default settings of any in-tree loaders,
it is necessary for a future Petitboot loader, due to the requirement that
it be compiled as a 64-bit program.

Reviewed by:	tsoome, imp (earlier revision)
Sponsored by:	Tag1 Consulting, Inc.
Differential Revision:	https://reviews.freebsd.org/D26364
This commit is contained in:
Brandon Bergren 2020-09-14 15:48:30 +00:00
parent 115c987b3f
commit 9e4c35f867
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=365724
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stand/ficl/ficl.h
View file

@ -249,7 +249,7 @@ typedef struct ficl_system_info FICL_SYSTEM_INFO;
** complement of false... that unifies logical and bitwise operations
** nicely.
*/
#define FICL_TRUE ((unsigned long)~(0L))
#define FICL_TRUE ((FICL_UNS)~(0LL))
#define FICL_FALSE (0)
#define FICL_BOOL(x) ((x) ? FICL_TRUE : FICL_FALSE)

9
stand/ficl/powerpc/sysdep.h
View file

@ -79,15 +79,15 @@
** System dependent data type declarations...
*/
#if !defined INT32
#define INT32 int
#define INT32 int32_t
#endif
#if !defined UNS32
#define UNS32 unsigned int
#define UNS32 uint32_t
#endif
#if !defined UNS16
#define UNS16 unsigned short
#define UNS16 uint16_t
#endif
#if !defined UNS8
@ -367,6 +367,9 @@ typedef struct
*/
#if !defined FICL_ALIGN
#define FICL_ALIGN 2
#endif
#if !defined FICL_ALIGN_ADD
#define FICL_ALIGN_ADD ((1 << FICL_ALIGN) - 1)
#endif

2
stand/powerpc/ofw/main.c
View file

@ -63,7 +63,7 @@ init_heap(void)
{
bzero(heap, HEAP_SIZE);
setheap(heap, (void *)((int)heap + HEAP_SIZE));
setheap(heap, (void *)((uintptr_t)heap + HEAP_SIZE));
}
uint64_t