November 2015 - openfirmware - mail.coreboot.org

ppcsim: modernize for ANSI C compilers
by Marcin Cieslak Nov. 14, 2015

Nov. 14, 2015

Index: cpu/ppc/ppcsim/ppcsim.c =================================================================== --- cpu/ppc/ppcsim/ppcsim.c (revision 3786) +++ cpu/ppc/ppcsim/ppcsim.c (working copy) @@ -39,6 +39,16 @@ #define ILLEGAL goto illegal +void catch_signals(); +void trace(char *name, u_long instruction, u_long pc); +int xfindnext(register u_char *adr, + register long strlen, + register long base, + register u_long link, + u_long *alf); + +void umtimes(u_long *dhighp, u_long *dlowp, u_long u1, u_long u2); + #ifdef TRACE #define INSTR(a) trace(a, instruction, pc) #else @@ -1832,6 +1842,7 @@ } +void umtimes(dhighp, dlowp, u1, u2) u_long *dhighp, *dlowp; u_long u1, u2; @@ -1868,6 +1879,7 @@ #ifdef TRACE #include <sys/signal.h> +void dumpregs() { #ifdef ARGREGS @@ -1916,6 +1928,7 @@ printf("\n"); #endif } +void dumpallregs() { int i; @@ -1937,6 +1950,8 @@ dumpregs(); s_bye(1); } + +void catch_signals() { signal(SIGINT,handle_signal); @@ -1950,6 +1965,7 @@ #endif } +void dumpmem(adr) long adr; { @@ -1968,9 +1984,12 @@ #else #define GETLINE #endif -trace(name, instruction) + +void +trace(name, instruction, pc) char *name; u_long instruction; + u_long pc; { int done; int arg; Index: cpu/ppc/ppcsim/simrom.c =================================================================== --- cpu/ppc/ppcsim/simrom.c (revision 3786) +++ cpu/ppc/ppcsim/simrom.c (working copy) @@ -3,13 +3,19 @@ * Main routine for calling the PowerPC simulator to simulate ROM images */ +#include <sys/types.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + extern void simulate(); -extern char *malloc(); char *loadaddr; #define MEMSIZE 0x800000 +int main() { int f;

2 1

ppc: "${BP}/forth/lib/debug.fth:45: cntx ?" [patch]
by Marcin Cieslak Nov. 14, 2015

Nov. 14, 2015

This fixes warning about undefined cntx issued during PPC cross-compilation: --- Cmd: ${HOSTDIR}/ppcforth ${BP}/cpu/ppc/build/kernel.dic ../tools.bth ${BP}/forth/lib/debug.fth:45: cntx ? ${BP}/forth/lib/debug.fth:297: cntx ? ${BP}/forth/lib/debug.fth:298: cntx ? Index: cpu/ppc/debugm.fth =================================================================== --- cpu/ppc/debugm.fth (revision 3786) +++ cpu/ppc/debugm.fth (working copy) @@ -14,7 +14,7 @@ nuser 'debug \ code field for high level trace nuser <ip \ lower limit of ip nuser ip> \ upper limit of ip -nuser cnt \ how many times thru debug next +nuser cntx \ how many times thru debug next \ Since we use a shared "next" routine, slow-next and fast-next are no-op's alias slow-next 2drop ( high low -- ) @@ -38,14 +38,14 @@ 'user ip> lwz t0,* cmpl 0,0,t2,t0 < if - 'user cnt lwz t0,* + 'user cntx lwz t0,* set t1,2 addi t0,t0,1 - 'user cnt stw t0,* + 'user cntx stw t0,* cmp 0,0,t0,t1 = if set t0,0 - 'user cnt stw t0,* + 'user cntx stw t0,* set t0,h#873d0004 \ lwzu w,4(ip) stw t0,0(up)

2 1

[commit] r3788 - cpu/ppc/ppcsim
by repository service Nov. 14, 2015

Nov. 14, 2015

Author: quozl Date: Sat Nov 14 02:12:02 2015 New Revision: 3788 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3788 Log: ppcsim: modernize for ANSI C compilers Contributed by Marcin Cieslak <saper(a)saper.info> Modified: cpu/ppc/ppcsim/ppcsim.c cpu/ppc/ppcsim/simrom.c Modified: cpu/ppc/ppcsim/ppcsim.c ============================================================================== --- cpu/ppc/ppcsim/ppcsim.c Sat Nov 14 02:11:02 2015 (r3787) +++ cpu/ppc/ppcsim/ppcsim.c Sat Nov 14 02:12:02 2015 (r3788) @@ -39,6 +39,16 @@ #define ILLEGAL goto illegal +void catch_signals(); +void trace(char *name, u_long instruction, u_long pc); +int xfindnext(register u_char *adr, + register long strlen, + register long base, + register u_long link, + u_long *alf); + +void umtimes(u_long *dhighp, u_long *dlowp, u_long u1, u_long u2); + #ifdef TRACE #define INSTR(a) trace(a, instruction, pc) #else @@ -1832,6 +1842,7 @@ } +void umtimes(dhighp, dlowp, u1, u2) u_long *dhighp, *dlowp; u_long u1, u2; @@ -1868,6 +1879,7 @@ #ifdef TRACE #include <sys/signal.h> +void dumpregs() { #ifdef ARGREGS @@ -1916,6 +1928,7 @@ printf("\n"); #endif } +void dumpallregs() { int i; @@ -1937,6 +1950,8 @@ dumpregs(); s_bye(1); } + +void catch_signals() { signal(SIGINT,handle_signal); @@ -1950,6 +1965,7 @@ #endif } +void dumpmem(adr) long adr; { @@ -1968,9 +1984,12 @@ #else #define GETLINE #endif -trace(name, instruction) + +void +trace(name, instruction, pc) char *name; u_long instruction; + u_long pc; { int done; int arg; Modified: cpu/ppc/ppcsim/simrom.c ============================================================================== --- cpu/ppc/ppcsim/simrom.c Sat Nov 14 02:11:02 2015 (r3787) +++ cpu/ppc/ppcsim/simrom.c Sat Nov 14 02:12:02 2015 (r3788) @@ -3,13 +3,19 @@ * Main routine for calling the PowerPC simulator to simulate ROM images */ +#include <sys/types.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + extern void simulate(); -extern char *malloc(); char *loadaddr; #define MEMSIZE 0x800000 +int main() { int f;

1 0

[commit] r3787 - cpu/ppc
by repository service Nov. 14, 2015

Nov. 14, 2015

Author: quozl Date: Sat Nov 14 02:11:02 2015 New Revision: 3787 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3787 Log: ppc: "${BP}/forth/lib/debug.fth:45: cntx ?" [patch] This fixes warning about undefined cntx issued during PPC cross-compilation: --- Cmd: ${HOSTDIR}/ppcforth ${BP}/cpu/ppc/build/kernel.dic ../tools.bth ${BP}/forth/lib/debug.fth:45: cntx ? ${BP}/forth/lib/debug.fth:297: cntx ? ${BP}/forth/lib/debug.fth:298: cntx ? Contributed by Marcin Cieslak <saper(a)saper.info> Modified: cpu/ppc/debugm.fth Modified: cpu/ppc/debugm.fth ============================================================================== --- cpu/ppc/debugm.fth Thu Oct 22 03:13:19 2015 (r3786) +++ cpu/ppc/debugm.fth Sat Nov 14 02:11:02 2015 (r3787) @@ -14,7 +14,7 @@ nuser 'debug \ code field for high level trace nuser <ip \ lower limit of ip nuser ip> \ upper limit of ip -nuser cnt \ how many times thru debug next +nuser cntx \ how many times thru debug next \ Since we use a shared "next" routine, slow-next and fast-next are no-op's alias slow-next 2drop ( high low -- ) @@ -38,14 +38,14 @@ 'user ip> lwz t0,* cmpl 0,0,t2,t0 < if - 'user cnt lwz t0,* + 'user cntx lwz t0,* set t1,2 addi t0,t0,1 - 'user cnt stw t0,* + 'user cntx stw t0,* cmp 0,0,t0,t1 = if set t0,0 - 'user cnt stw t0,* + 'user cntx stw t0,* set t0,h#873d0004 \ lwzu w,4(ip) stw t0,0(up)

1 0