frv: use the common ascii hex helpers

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Harvey Harrison 2008-07-25 19:45:19 -07:00 committed by Linus Torvalds
parent 42a9a58361
commit 19caeed633
1 changed files with 36 additions and 52 deletions

View File

@ -182,8 +182,6 @@ extern volatile u32 __attribute__((section(".bss"))) gdbstub_trace_through_excep
static char input_buffer[BUFMAX]; static char input_buffer[BUFMAX];
static char output_buffer[BUFMAX]; static char output_buffer[BUFMAX];
static const char hexchars[] = "0123456789abcdef";
static const char *regnames[] = { static const char *regnames[] = {
"PSR ", "ISR ", "CCR ", "CCCR", "PSR ", "ISR ", "CCR ", "CCCR",
"LR ", "LCR ", "PC ", "_stt", "LR ", "LCR ", "PC ", "_stt",
@ -383,8 +381,8 @@ static int gdbstub_send_packet(char *buffer)
} }
gdbstub_tx_char('#'); gdbstub_tx_char('#');
gdbstub_tx_char(hexchars[checksum >> 4]); gdbstub_tx_char(hex_asc_hi(checksum));
gdbstub_tx_char(hexchars[checksum & 0xf]); gdbstub_tx_char(hex_asc_lo(checksum));
} while (gdbstub_rx_char(&ch,0), } while (gdbstub_rx_char(&ch,0),
#ifdef GDBSTUB_DEBUG_PROTOCOL #ifdef GDBSTUB_DEBUG_PROTOCOL
@ -674,8 +672,7 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
if ((uint32_t)mem&1 && count>=1) { if ((uint32_t)mem&1 && count>=1) {
if (!gdbstub_read_byte(mem,ch)) if (!gdbstub_read_byte(mem,ch))
return NULL; return NULL;
*buf++ = hexchars[ch[0] >> 4]; buf = pack_hex_byte(buf, ch[0]);
*buf++ = hexchars[ch[0] & 0xf];
mem++; mem++;
count--; count--;
} }
@ -683,10 +680,8 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
if ((uint32_t)mem&3 && count>=2) { if ((uint32_t)mem&3 && count>=2) {
if (!gdbstub_read_word(mem,(uint16_t *)ch)) if (!gdbstub_read_word(mem,(uint16_t *)ch))
return NULL; return NULL;
*buf++ = hexchars[ch[0] >> 4]; buf = pack_hex_byte(buf, ch[0]);
*buf++ = hexchars[ch[0] & 0xf]; buf = pack_hex_byte(buf, ch[1]);
*buf++ = hexchars[ch[1] >> 4];
*buf++ = hexchars[ch[1] & 0xf];
mem += 2; mem += 2;
count -= 2; count -= 2;
} }
@ -694,14 +689,10 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
while (count>=4) { while (count>=4) {
if (!gdbstub_read_dword(mem,(uint32_t *)ch)) if (!gdbstub_read_dword(mem,(uint32_t *)ch))
return NULL; return NULL;
*buf++ = hexchars[ch[0] >> 4]; buf = pack_hex_byte(buf, ch[0]);
*buf++ = hexchars[ch[0] & 0xf]; buf = pack_hex_byte(buf, ch[1]);
*buf++ = hexchars[ch[1] >> 4]; buf = pack_hex_byte(buf, ch[2]);
*buf++ = hexchars[ch[1] & 0xf]; buf = pack_hex_byte(buf, ch[3]);
*buf++ = hexchars[ch[2] >> 4];
*buf++ = hexchars[ch[2] & 0xf];
*buf++ = hexchars[ch[3] >> 4];
*buf++ = hexchars[ch[3] & 0xf];
mem += 4; mem += 4;
count -= 4; count -= 4;
} }
@ -709,10 +700,8 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
if (count>=2) { if (count>=2) {
if (!gdbstub_read_word(mem,(uint16_t *)ch)) if (!gdbstub_read_word(mem,(uint16_t *)ch))
return NULL; return NULL;
*buf++ = hexchars[ch[0] >> 4]; buf = pack_hex_byte(buf, ch[0]);
*buf++ = hexchars[ch[0] & 0xf]; buf = pack_hex_byte(buf, ch[1]);
*buf++ = hexchars[ch[1] >> 4];
*buf++ = hexchars[ch[1] & 0xf];
mem += 2; mem += 2;
count -= 2; count -= 2;
} }
@ -720,8 +709,7 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
if (count>=1) { if (count>=1) {
if (!gdbstub_read_byte(mem,ch)) if (!gdbstub_read_byte(mem,ch))
return NULL; return NULL;
*buf++ = hexchars[ch[0] >> 4]; buf = pack_hex_byte(buf, ch[0]);
*buf++ = hexchars[ch[0] & 0xf];
} }
*buf = 0; *buf = 0;
@ -1471,22 +1459,22 @@ void gdbstub(int sigval)
*ptr++ = 'O'; *ptr++ = 'O';
ptr = mem2hex(title, ptr, sizeof(title) - 1,0); ptr = mem2hex(title, ptr, sizeof(title) - 1,0);
hx = hexchars[(brr & 0xf0000000) >> 28]; hx = hex_asc_hi(brr >> 24);
*ptr++ = hexchars[hx >> 4]; *ptr++ = hexchars[hx & 0xf]; ptr = pack_hex_byte(ptr, hx);
hx = hexchars[(brr & 0x0f000000) >> 24]; hx = hex_asc_lo(brr >> 24);
*ptr++ = hexchars[hx >> 4]; *ptr++ = hexchars[hx & 0xf]; ptr = pack_hex_byte(ptr, hx);
hx = hexchars[(brr & 0x00f00000) >> 20]; hx = hex_asc_hi(brr >> 16);
*ptr++ = hexchars[hx >> 4]; *ptr++ = hexchars[hx & 0xf]; ptr = pack_hex_byte(ptr, hx);
hx = hexchars[(brr & 0x000f0000) >> 16]; hx = hex_asc_lo(brr >> 16);
*ptr++ = hexchars[hx >> 4]; *ptr++ = hexchars[hx & 0xf]; ptr = pack_hex_byte(ptr, hx);
hx = hexchars[(brr & 0x0000f000) >> 12]; hx = hex_asc_hi(brr >> 8);
*ptr++ = hexchars[hx >> 4]; *ptr++ = hexchars[hx & 0xf]; ptr = pack_hex_byte(ptr, hx);
hx = hexchars[(brr & 0x00000f00) >> 8]; hx = hex_asc_lo(brr >> 8);
*ptr++ = hexchars[hx >> 4]; *ptr++ = hexchars[hx & 0xf]; ptr = pack_hex_byte(ptr, hx);
hx = hexchars[(brr & 0x000000f0) >> 4]; hx = hex_asc_hi(brr);
*ptr++ = hexchars[hx >> 4]; *ptr++ = hexchars[hx & 0xf]; ptr = pack_hex_byte(ptr, hx);
hx = hexchars[(brr & 0x0000000f)]; hx = hex_asc_lo(brr);
*ptr++ = hexchars[hx >> 4]; *ptr++ = hexchars[hx & 0xf]; ptr = pack_hex_byte(ptr, hx);
ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0); ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0);
*ptr = 0; *ptr = 0;
@ -1500,12 +1488,10 @@ void gdbstub(int sigval)
/* Send trap type (converted to signal) */ /* Send trap type (converted to signal) */
*ptr++ = 'T'; *ptr++ = 'T';
*ptr++ = hexchars[sigval >> 4]; ptr = pack_hex_byte(ptr, sigval);
*ptr++ = hexchars[sigval & 0xf];
/* Send Error PC */ /* Send Error PC */
*ptr++ = hexchars[GDB_REG_PC >> 4]; ptr = pack_hex_byte(ptr, GDB_REG_PC);
*ptr++ = hexchars[GDB_REG_PC & 0xf];
*ptr++ = ':'; *ptr++ = ':';
ptr = mem2hex(&__debug_frame->pc, ptr, 4, 0); ptr = mem2hex(&__debug_frame->pc, ptr, 4, 0);
*ptr++ = ';'; *ptr++ = ';';
@ -1513,8 +1499,7 @@ void gdbstub(int sigval)
/* /*
* Send frame pointer * Send frame pointer
*/ */
*ptr++ = hexchars[GDB_REG_FP >> 4]; ptr = pack_hex_byte(ptr, GDB_REG_FP);
*ptr++ = hexchars[GDB_REG_FP & 0xf];
*ptr++ = ':'; *ptr++ = ':';
ptr = mem2hex(&__debug_frame->fp, ptr, 4, 0); ptr = mem2hex(&__debug_frame->fp, ptr, 4, 0);
*ptr++ = ';'; *ptr++ = ';';
@ -1522,8 +1507,7 @@ void gdbstub(int sigval)
/* /*
* Send stack pointer * Send stack pointer
*/ */
*ptr++ = hexchars[GDB_REG_SP >> 4]; ptr = pack_hex_byte(ptr, GDB_REG_SP);
*ptr++ = hexchars[GDB_REG_SP & 0xf];
*ptr++ = ':'; *ptr++ = ':';
ptr = mem2hex(&__debug_frame->sp, ptr, 4, 0); ptr = mem2hex(&__debug_frame->sp, ptr, 4, 0);
*ptr++ = ';'; *ptr++ = ';';
@ -1548,8 +1532,8 @@ void gdbstub(int sigval)
/* request repeat of last signal number */ /* request repeat of last signal number */
case '?': case '?':
output_buffer[0] = 'S'; output_buffer[0] = 'S';
output_buffer[1] = hexchars[sigval >> 4]; output_buffer[1] = hex_asc_hi(sigval);
output_buffer[2] = hexchars[sigval & 0xf]; output_buffer[2] = hex_asc_lo(sigval);
output_buffer[3] = 0; output_buffer[3] = 0;
break; break;
@ -2059,8 +2043,8 @@ void gdbstub_exit(int status)
} }
gdbstub_tx_char('#'); gdbstub_tx_char('#');
gdbstub_tx_char(hexchars[checksum >> 4]); gdbstub_tx_char(hex_asc_hi(checksum));
gdbstub_tx_char(hexchars[checksum & 0xf]); gdbstub_tx_char(hex_asc_lo(checksum));
/* make sure the output is flushed, or else RedBoot might clobber it */ /* make sure the output is flushed, or else RedBoot might clobber it */
gdbstub_tx_char('-'); gdbstub_tx_char('-');