mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 00:14:22 +08:00
Add underscore at beginning of alert() as well
This commit is contained in:
@@ -142,17 +142,17 @@ void up_assert(void)
|
||||
|
||||
#ifdef CONFIG_HAVE_FILENAME
|
||||
#if CONFIG_TASK_NAME_SIZE > 0
|
||||
alert("Assertion failed at file:%s line: %d task: %s\n",
|
||||
_alert("Assertion failed at file:%s line: %d task: %s\n",
|
||||
filename, lineno, rtcb->name);
|
||||
#else
|
||||
alert("Assertion failed at file:%s line: %d\n",
|
||||
_alert("Assertion failed at file:%s line: %d\n",
|
||||
filename, lineno);
|
||||
#endif
|
||||
#else
|
||||
#if CONFIG_TASK_NAME_SIZE > 0
|
||||
alert("Assertion failed: task: %s\n", rtcb->name);
|
||||
_alert("Assertion failed: task: %s\n", rtcb->name);
|
||||
#else
|
||||
alert("Assertion failed\n");
|
||||
_alert("Assertion failed\n");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@@ -68,13 +68,13 @@ static void up_stackdump(void)
|
||||
uint16_t stack_base = (uint16_t)rtcb->adj_stack_ptr;
|
||||
uint16_t stack_size = (uint16_t)rtcb->adj_stack_size;
|
||||
|
||||
alert("stack_base: %04x\n", stack_base);
|
||||
alert("stack_size: %04x\n", stack_size);
|
||||
alert("sp: %04x\n", sp);
|
||||
_alert("stack_base: %04x\n", stack_base);
|
||||
_alert("stack_size: %04x\n", stack_size);
|
||||
_alert("sp: %04x\n", sp);
|
||||
|
||||
if (sp >= stack_base || sp < stack_base - stack_size)
|
||||
{
|
||||
alert("ERROR: Stack pointer is not within allocated stack\n");
|
||||
_alert("ERROR: Stack pointer is not within allocated stack\n");
|
||||
return;
|
||||
}
|
||||
else
|
||||
@@ -84,7 +84,7 @@ static void up_stackdump(void)
|
||||
for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(uint16_t))
|
||||
{
|
||||
uint16_t *ptr = (uint16_t*)stack;
|
||||
alert("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
|
||||
_alert("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
|
||||
stack, ptr[0], ptr[1], ptr[2], ptr[3],
|
||||
ptr[4], ptr[5], ptr[6], ptr[7]);
|
||||
}
|
||||
|
||||
@@ -70,22 +70,22 @@ static void ez80_registerdump(void)
|
||||
if (g_current_regs)
|
||||
{
|
||||
#ifdef CONFIG_EZ80_Z80MODE
|
||||
alert("AF: %04x I: %04x\n",
|
||||
_alert("AF: %04x I: %04x\n",
|
||||
g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
|
||||
alert("BC: %04x DE: %04x HL: %04x\n",
|
||||
_alert("BC: %04x DE: %04x HL: %04x\n",
|
||||
g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
|
||||
alert("IX: %04x IY: %04x\n",
|
||||
_alert("IX: %04x IY: %04x\n",
|
||||
g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
|
||||
alert("SP: %04x PC: %04x\n"
|
||||
_alert("SP: %04x PC: %04x\n"
|
||||
g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
|
||||
#else
|
||||
alert("AF: %06x I: %06x\n",
|
||||
_alert("AF: %06x I: %06x\n",
|
||||
g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
|
||||
alert("BC: %06x DE: %06x HL: %06x\n",
|
||||
_alert("BC: %06x DE: %06x HL: %06x\n",
|
||||
g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
|
||||
alert("IX: %06x IY: %06x\n",
|
||||
_alert("IX: %06x IY: %06x\n",
|
||||
g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
|
||||
alert("SP: %06x PC: %06x\n"
|
||||
_alert("SP: %06x PC: %06x\n"
|
||||
g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -61,15 +61,15 @@ static void z180_registerdump(void)
|
||||
{
|
||||
if (g_current_regs)
|
||||
{
|
||||
alert("AF: %04x I: %04x\n",
|
||||
_alert("AF: %04x I: %04x\n",
|
||||
g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
|
||||
alert("BC: %04x DE: %04x HL: %04x\n",
|
||||
_alert("BC: %04x DE: %04x HL: %04x\n",
|
||||
g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
|
||||
alert("IX: %04x IY: %04x\n",
|
||||
_alert("IX: %04x IY: %04x\n",
|
||||
g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
|
||||
alert("SP: %04x PC: %04x\n"
|
||||
_alert("SP: %04x PC: %04x\n"
|
||||
g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
|
||||
alert("CBAR: %02x BBR: %02x CBR: %02x\n"
|
||||
_alert("CBAR: %02x BBR: %02x CBR: %02x\n"
|
||||
inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
static inline void z8_dumpregs(FAR chipret_t *regs)
|
||||
{
|
||||
alert("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
|
||||
_alert("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
|
||||
regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6],
|
||||
regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]);
|
||||
}
|
||||
@@ -64,7 +64,7 @@ static inline void z8_dumpregs(FAR chipret_t *regs)
|
||||
static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl,
|
||||
chipreg_t rpflags)
|
||||
{
|
||||
alert("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
|
||||
_alert("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
|
||||
sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff);
|
||||
}
|
||||
|
||||
|
||||
@@ -61,13 +61,13 @@ static void z80_registerdump(void)
|
||||
{
|
||||
if (g_current_regs)
|
||||
{
|
||||
alert("AF: %04x I: %04x\n",
|
||||
_alert("AF: %04x I: %04x\n",
|
||||
g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
|
||||
alert("BC: %04x DE: %04x HL: %04x\n",
|
||||
_alert("BC: %04x DE: %04x HL: %04x\n",
|
||||
g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
|
||||
alert("IX: %04x IY: %04x\n",
|
||||
_alert("IX: %04x IY: %04x\n",
|
||||
g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
|
||||
alert("SP: %04x PC: %04x\n"
|
||||
_alert("SP: %04x PC: %04x\n"
|
||||
g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user