|
@@ -154,7 +154,7 @@ static int do_spu_cmd(void);
|
|
|
static void dump_tlb_44x(void);
|
|
|
#endif
|
|
|
|
|
|
-int xmon_no_auto_backtrace;
|
|
|
+static int xmon_no_auto_backtrace;
|
|
|
|
|
|
extern void xmon_enter(void);
|
|
|
extern void xmon_leave(void);
|
|
@@ -593,7 +593,7 @@ static int xmon_iabr_match(struct pt_regs *regs)
|
|
|
{
|
|
|
if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
|
|
|
return 0;
|
|
|
- if (iabr == 0)
|
|
|
+ if (iabr == NULL)
|
|
|
return 0;
|
|
|
xmon_core(regs, 0);
|
|
|
return 1;
|
|
@@ -1142,7 +1142,7 @@ bpt_cmds(void)
|
|
|
} else {
|
|
|
/* assume a breakpoint address */
|
|
|
bp = at_breakpoint(a);
|
|
|
- if (bp == 0) {
|
|
|
+ if (bp == NULL) {
|
|
|
printf("No breakpoint at %x\n", a);
|
|
|
break;
|
|
|
}
|
|
@@ -1370,7 +1370,7 @@ static void print_bug_trap(struct pt_regs *regs)
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
-void excprint(struct pt_regs *fp)
|
|
|
+static void excprint(struct pt_regs *fp)
|
|
|
{
|
|
|
unsigned long trap;
|
|
|
|
|
@@ -1408,7 +1408,7 @@ void excprint(struct pt_regs *fp)
|
|
|
print_bug_trap(fp);
|
|
|
}
|
|
|
|
|
|
-void prregs(struct pt_regs *fp)
|
|
|
+static void prregs(struct pt_regs *fp)
|
|
|
{
|
|
|
int n, trap;
|
|
|
unsigned long base;
|
|
@@ -1463,7 +1463,7 @@ void prregs(struct pt_regs *fp)
|
|
|
printf("dar = "REG" dsisr = %.8lx\n", fp->dar, fp->dsisr);
|
|
|
}
|
|
|
|
|
|
-void cacheflush(void)
|
|
|
+static void cacheflush(void)
|
|
|
{
|
|
|
int cmd;
|
|
|
unsigned long nflush;
|
|
@@ -1495,7 +1495,7 @@ void cacheflush(void)
|
|
|
catch_memory_errors = 0;
|
|
|
}
|
|
|
|
|
|
-unsigned long
|
|
|
+static unsigned long
|
|
|
read_spr(int n)
|
|
|
{
|
|
|
unsigned int instrs[2];
|
|
@@ -1533,7 +1533,7 @@ read_spr(int n)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
write_spr(int n, unsigned long val)
|
|
|
{
|
|
|
unsigned int instrs[2];
|
|
@@ -1571,7 +1571,7 @@ static unsigned long regno;
|
|
|
extern char exc_prolog;
|
|
|
extern char dec_exc;
|
|
|
|
|
|
-void super_regs(void)
|
|
|
+static void super_regs(void)
|
|
|
{
|
|
|
int cmd;
|
|
|
unsigned long val;
|
|
@@ -1629,7 +1629,7 @@ void super_regs(void)
|
|
|
/*
|
|
|
* Stuff for reading and writing memory safely
|
|
|
*/
|
|
|
-int
|
|
|
+static int
|
|
|
mread(unsigned long adrs, void *buf, int size)
|
|
|
{
|
|
|
volatile int n;
|
|
@@ -1666,7 +1666,7 @@ mread(unsigned long adrs, void *buf, int size)
|
|
|
return n;
|
|
|
}
|
|
|
|
|
|
-int
|
|
|
+static int
|
|
|
mwrite(unsigned long adrs, void *buf, int size)
|
|
|
{
|
|
|
volatile int n;
|
|
@@ -1731,7 +1731,7 @@ static int handle_fault(struct pt_regs *regs)
|
|
|
|
|
|
#define SWAP(a, b, t) ((t) = (a), (a) = (b), (b) = (t))
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
byterev(unsigned char *val, int size)
|
|
|
{
|
|
|
int t;
|
|
@@ -1793,7 +1793,7 @@ static char *memex_subcmd_help_string =
|
|
|
" x exit this mode\n"
|
|
|
"";
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
memex(void)
|
|
|
{
|
|
|
int cmd, inc, i, nslash;
|
|
@@ -1944,7 +1944,7 @@ memex(void)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-int
|
|
|
+static int
|
|
|
bsesc(void)
|
|
|
{
|
|
|
int c;
|
|
@@ -1984,7 +1984,7 @@ static void xmon_rawdump (unsigned long adrs, long ndump)
|
|
|
#define isxdigit(c) (('0' <= (c) && (c) <= '9') \
|
|
|
|| ('a' <= (c) && (c) <= 'f') \
|
|
|
|| ('A' <= (c) && (c) <= 'F'))
|
|
|
-void
|
|
|
+static void
|
|
|
dump(void)
|
|
|
{
|
|
|
int c;
|
|
@@ -2022,7 +2022,7 @@ dump(void)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
prdump(unsigned long adrs, long ndump)
|
|
|
{
|
|
|
long n, m, c, r, nr;
|
|
@@ -2066,7 +2066,7 @@ prdump(unsigned long adrs, long ndump)
|
|
|
|
|
|
typedef int (*instruction_dump_func)(unsigned long inst, unsigned long addr);
|
|
|
|
|
|
-int
|
|
|
+static int
|
|
|
generic_inst_dump(unsigned long adr, long count, int praddr,
|
|
|
instruction_dump_func dump_func)
|
|
|
{
|
|
@@ -2104,7 +2104,7 @@ generic_inst_dump(unsigned long adr, long count, int praddr,
|
|
|
return adr - first_adr;
|
|
|
}
|
|
|
|
|
|
-int
|
|
|
+static int
|
|
|
ppc_inst_dump(unsigned long adr, long count, int praddr)
|
|
|
{
|
|
|
return generic_inst_dump(adr, count, praddr, print_insn_powerpc);
|
|
@@ -2126,7 +2126,7 @@ static unsigned long mval; /* byte value to set memory to */
|
|
|
static unsigned long mcount; /* # bytes to affect */
|
|
|
static unsigned long mdiffs; /* max # differences to print */
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
memops(int cmd)
|
|
|
{
|
|
|
scanhex((void *)&mdest);
|
|
@@ -2152,7 +2152,7 @@ memops(int cmd)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
memdiffs(unsigned char *p1, unsigned char *p2, unsigned nb, unsigned maxpr)
|
|
|
{
|
|
|
unsigned n, prt;
|
|
@@ -2170,7 +2170,7 @@ memdiffs(unsigned char *p1, unsigned char *p2, unsigned nb, unsigned maxpr)
|
|
|
static unsigned mend;
|
|
|
static unsigned mask;
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
memlocate(void)
|
|
|
{
|
|
|
unsigned a, n;
|
|
@@ -2203,7 +2203,7 @@ memlocate(void)
|
|
|
static unsigned long mskip = 0x1000;
|
|
|
static unsigned long mlim = 0xffffffff;
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
memzcan(void)
|
|
|
{
|
|
|
unsigned char v;
|
|
@@ -2230,7 +2230,7 @@ memzcan(void)
|
|
|
printf("%.8x\n", a - mskip);
|
|
|
}
|
|
|
|
|
|
-void proccall(void)
|
|
|
+static void proccall(void)
|
|
|
{
|
|
|
unsigned long args[8];
|
|
|
unsigned long ret;
|
|
@@ -2388,7 +2388,7 @@ scanhex(unsigned long *vp)
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
scannl(void)
|
|
|
{
|
|
|
int c;
|
|
@@ -2399,7 +2399,7 @@ scannl(void)
|
|
|
c = inchar();
|
|
|
}
|
|
|
|
|
|
-int hexdigit(int c)
|
|
|
+static int hexdigit(int c)
|
|
|
{
|
|
|
if( '0' <= c && c <= '9' )
|
|
|
return c - '0';
|
|
@@ -2430,13 +2430,13 @@ getstring(char *s, int size)
|
|
|
static char line[256];
|
|
|
static char *lineptr;
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
flush_input(void)
|
|
|
{
|
|
|
lineptr = NULL;
|
|
|
}
|
|
|
|
|
|
-int
|
|
|
+static int
|
|
|
inchar(void)
|
|
|
{
|
|
|
if (lineptr == NULL || *lineptr == 0) {
|
|
@@ -2449,7 +2449,7 @@ inchar(void)
|
|
|
return *lineptr++;
|
|
|
}
|
|
|
|
|
|
-void
|
|
|
+static void
|
|
|
take_input(char *str)
|
|
|
{
|
|
|
lineptr = str;
|
|
@@ -2618,7 +2618,8 @@ static void dump_tlb_44x(void)
|
|
|
}
|
|
|
}
|
|
|
#endif /* CONFIG_44x */
|
|
|
-void xmon_init(int enable)
|
|
|
+
|
|
|
+static void xmon_init(int enable)
|
|
|
{
|
|
|
#ifdef CONFIG_PPC_ISERIES
|
|
|
if (firmware_has_feature(FW_FEATURE_ISERIES))
|