Virtualization
/
openbios
mirror of https://gitlab.com/qemu-project/openbios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean out some warnings. 

git-svn-id: svn://coreboot.org/openbios/openbios-devel@2 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Stefan Reinauer 2006-04-26 15:14:50 +00:00
parent 5c9eb9b45b
commit 790e50099c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/examples/x86_rules.xml
View File

@ -10,7 +10,7 @@ ARCH := x86
ODIR := obj-$(ARCH)
HOSTCC := gcc
CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -USWAP_ENDIANNESS
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -Wno-unused
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
CC := gcc -m32

20
kernel/bootstrap.c
View File

@ -98,7 +98,7 @@ void init_trampoline(void)
* dictionary related functions.
*/
static void relocation_table(char * dict_one, char *dict_two, int length)
static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, int length)
{
ucell *d1=(ucell *)dict_one, *d2=(ucell *)dict_two;
ucell *reloc_table;
@ -118,9 +118,10 @@ static void relocation_table(char * dict_one, char *dict_two, int length)
if(d1[i]==d2[i]) {
reloc_table[pos] &= target_ucell(~(1UL<<bit));
if(d1[i] >= pointer2cell(dict_one) &&
d1[i] <= pointer2cell(dict_one+length))
printk("\nWARNING: inconsistent relocation (%x:%x)!\n", d1[i], d2[i]);
// This check might bring false positives in data.
//if(d1[i] >= pointer2cell(dict_one) &&
// d1[i] <= pointer2cell(dict_one+length))
// printk("\nWARNING: inconsistent relocation (%x:%x)!\n", d1[i], d2[i]);
} else {
/* This is a pointer, it needs relocation, d2==dict */
reloc_table[pos] |= target_ucell(1UL<<bit);
@ -878,12 +879,12 @@ encode_file( const char *name )
}
static void run_dictionary(const char *basedict)
static void run_dictionary(char *basedict)
{
if(!basedict)
return;
read_dictionary((char *)basedict);
read_dictionary(basedict);
PC = (ucell)findword("initialize");
if (!PC)
@ -953,8 +954,8 @@ int main(int argc, char *argv[])
struct sigaction sa;
unsigned char *ressources=NULL; /* All memory used by us */
unsigned char *dictname = NULL;
unsigned char *basedict = NULL;
char *dictname = NULL;
char *basedict = NULL;
unsigned char *bootstrapdict[2];
int c, cnt;
@ -1102,8 +1103,7 @@ int main(int argc, char *argv[])
#endif
{
relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead);
write_dictionary( dictname ? dictname :
(unsigned char *)"bootstrap.dict");
write_dictionary( dictname ? dictname : "bootstrap.dict");
}
free(ressources);

2
kernel/internal.c
View File

@ -73,7 +73,7 @@ static inline void next(void)
int enterforth(xt_t xt)
{
ucell *_cfa = (ucell*)cell2pointer(xt);
ucell tmp;
cell tmp;
if (read_ucell(_cfa) != DOCOL ) {
trampoline[1] = target_ucell(xt);