summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/romcc/romcc.c6
-rw-r--r--util/sconfig/config.g5
-rw-r--r--util/sconfig/parsedesc.g4
-rw-r--r--util/sconfig/yapps2.py5
-rw-r--r--util/x86emu/x86.c8
5 files changed, 18 insertions, 10 deletions
diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
index 695130e5ff..e049abf763 100644
--- a/util/romcc/romcc.c
+++ b/util/romcc/romcc.c
@@ -23843,12 +23843,12 @@ static long get_const_pool_ref(
long ref;
ref = next_label(state);
fprintf(fp, ".section \"" DATA_SECTION "\"\n");
- fprintf(fp, ".balign %ld\n", align_of_in_bytes(state, ins->type));
+ fprintf(fp, ".balign %ld\n", (long int)align_of_in_bytes(state, ins->type));
fprintf(fp, "L%s%lu:\n", state->compiler->label_prefix, ref);
print_const(state, ins, fp);
fill_bytes = bits_to_bytes(size - size_of(state, ins->type));
if (fill_bytes) {
- fprintf(fp, ".fill %ld, 1, 0\n", fill_bytes);
+ fprintf(fp, ".fill %ld, 1, 0\n", (long int)fill_bytes);
}
fprintf(fp, ".section \"" TEXT_SECTION "\"\n");
return ref;
@@ -24657,7 +24657,7 @@ static void print_sdecl(struct compile_state *state,
struct triple *ins, FILE *fp)
{
fprintf(fp, ".section \"" DATA_SECTION "\"\n");
- fprintf(fp, ".balign %ld\n", align_of_in_bytes(state, ins->type));
+ fprintf(fp, ".balign %ld\n", (long int)align_of_in_bytes(state, ins->type));
fprintf(fp, "L%s%lu:\n",
state->compiler->label_prefix, (unsigned long)(ins->u.cval));
print_const(state, MISC(ins, 0), fp);
diff --git a/util/sconfig/config.g b/util/sconfig/config.g
index db3c516583..fdb1f05fe9 100644
--- a/util/sconfig/config.g
+++ b/util/sconfig/config.g
@@ -886,7 +886,7 @@ def dumptree(part, lvl):
def writecode(image):
filename = os.path.join(img_dir, "static.c")
- print "Creating", filename
+ print " SCONFIG Creating", os.path.basename(filename)
file = safe_open(filename, 'w+')
file.write("#include <device/device.h>\n")
file.write("#include <device/pci.h>\n")
@@ -920,7 +920,7 @@ def gencode(part, file, pass_num):
def writegraph(image):
filename = os.path.join(img_dir, "static.dot")
- print "Creating", filename
+ print " SCONFIG Creating", os.path.basename(filename)
file = safe_open(filename, 'w+')
file.write("digraph devicetree {\n")
file.write(" rankdir=LR\n")
@@ -1015,7 +1015,6 @@ if __name__=='__main__':
fp = safe_open(config_file, 'r')
if (not parse('devicetree', fp.read())):
fatal("Could not parse file")
- print "PARSED THE TREE"
partstack.pop()
img_dir = argv[3]
diff --git a/util/sconfig/parsedesc.g b/util/sconfig/parsedesc.g
index 7113c6d6f3..4c759eb265 100644
--- a/util/sconfig/parsedesc.g
+++ b/util/sconfig/parsedesc.g
@@ -126,8 +126,8 @@ def generate(inputfilename, outputfilename='', dump=0, **flags):
if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py'
else: raise "Invalid Filename", outputfilename
- print 'Input Grammar:', inputfilename
- print 'Output File:', outputfilename
+ print ' SCONFIG Input Grammar:', os.path.basename(inputfilename)
+ print ' SCONFIG Output File:', os.path.basename(outputfilename)
DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers
preparser, postparser = None, None # Code before and after the parser desc
diff --git a/util/sconfig/yapps2.py b/util/sconfig/yapps2.py
index 71bfa05ca6..f53f16897b 100644
--- a/util/sconfig/yapps2.py
+++ b/util/sconfig/yapps2.py
@@ -18,6 +18,7 @@
from string import *
from yappsrt import *
import re
+import os.path
INDENT = " "*4
@@ -709,8 +710,8 @@ def generate(inputfilename, outputfilename='', dump=0, **flags):
if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py'
else: raise "Invalid Filename", outputfilename
- print 'Input Grammar:', inputfilename
- print 'Output File:', outputfilename
+ print ' SCONFIG Input Grammar:', os.path.basename(inputfilename)
+ print ' SCONFIG Output File:', os.path.basename(outputfilename)
DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers
preparser, postparser = None, None # Code before and after the parser desc
diff --git a/util/x86emu/x86.c b/util/x86emu/x86.c
index 9f373e79dd..2f314a043f 100644
--- a/util/x86emu/x86.c
+++ b/util/x86emu/x86.c
@@ -149,6 +149,14 @@ int __attribute__((regparm(0))) interrupt_handler(u32 intnumber,
u32 ebp, u32 esp,
u32 ebx, u32 edx,
u32 ecx, u32 eax,
+ u32 cs_ip, u16 stackflags);
+
+int __attribute__((regparm(0))) interrupt_handler(u32 intnumber,
+ u32 gsfs, u32 dses,
+ u32 edi, u32 esi,
+ u32 ebp, u32 esp,
+ u32 ebx, u32 edx,
+ u32 ecx, u32 eax,
u32 cs_ip, u16 stackflags)
{
u32 ip;