Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
---
arch/cris/arch-v10/kernel/kgdb.c | 50 ++++++----------------------------------
1 file changed, 7 insertions(+), 43 deletions(-)
diff --git a/arch/cris/arch-v10/kernel/kgdb.c b/arch/cris/arch-v10/kernel/kgdb.c
index 37e6d2c..07bccd8 100644
--- a/arch/cris/arch-v10/kernel/kgdb.c
+++ b/arch/cris/arch-v10/kernel/kgdb.c
@@ -278,19 +278,11 @@ void putDebugChar (int val);
void enableDebugIRQ (void);
-/* Returns the integer equivalent of a hexadecimal character. */
-static int hex (char ch);
-
/* Convert the memory, pointed to by mem into hexadecimal representation.
Put the result in buf, and return a pointer to the last character
in buf (null). */
static char *mem2hex (char *buf, unsigned char *mem, int count);
-/* Convert the array, in hexadecimal representation, pointed to by buf into
- binary representation. Put the result in mem, and return a pointer to
- the character after the last byte written. */
-static unsigned char *hex2mem (unsigned char *mem, char *buf, int count);
-
/* Put the content of the array, in binary representation, pointed to by buf
into memory pointed to by mem, and return a pointer to
the character after the last byte written. */
@@ -560,7 +552,7 @@ write_register (int regno, char *val)
if (regno >= R0 && regno <= PC) {
/* 32-bit register with simple offset. */
- hex2mem ((unsigned char *)current_reg + regno * sizeof(unsigned
int),
+ hex2bin((unsigned char *)current_reg + regno * sizeof(unsigned
int),
val, sizeof(unsigned int));
}
else if (regno == P0 || regno == VR || regno == P4 || regno == P8) {
@@ -570,12 +562,12 @@ write_register (int regno, char *val)
else if (regno == CCR) {
/* 16 bit register with complex offset. (P4 is read-only, P6 is
not implemented,
and P7 (MOF) is 32 bits in ETRAX 100LX. */
- hex2mem ((unsigned char *)&(current_reg->ccr) + (regno-CCR) *
sizeof(unsigned short),
+ hex2bin((unsigned char *)&(current_reg->ccr) + (regno-CCR) *
sizeof(unsigned short),
val, sizeof(unsigned short));
}
else if (regno >= MOF && regno <= USP) {
/* 32 bit register with complex offset. (P8 has been taken
care of.) */
- hex2mem ((unsigned char *)&(current_reg->ibr) + (regno-IBR) *
sizeof(unsigned int),
+ hex2bin((unsigned char *)&(current_reg->ibr) + (regno-IBR) *
sizeof(unsigned int),
val, sizeof(unsigned int));
}
else {
@@ -595,7 +587,7 @@ write_stack_register (int thread_id, int regno, char
*valptr)
stack_registers *d = (stack_registers *)stack_list[thread_id];
unsigned int val;
- hex2mem ((unsigned char *)&val, valptr, sizeof(unsigned int));
+ hex2bin((unsigned char *)&val, valptr, sizeof(unsigned int));
if (regno >= R0 && regno < SP) {
d->r[regno] = val;
}
@@ -659,18 +651,6 @@ read_register (char regno, unsigned int *valptr)
}
/********************************** Packet I/O ******************************/
-/* Returns the integer equivalent of a hexadecimal character. */
-static int
-hex (char ch)
-{
- if ((ch >= 'a') && (ch <= 'f'))
- return (ch - 'a' + 10);
- if ((ch >= '0') && (ch <= '9'))
- return (ch - '0');
- if ((ch >= 'A') && (ch <= 'F'))
- return (ch - 'A' + 10);
- return (-1);
-}
/* Convert the memory, pointed to by mem into hexadecimal representation.
Put the result in buf, and return a pointer to the last character
@@ -703,22 +683,6 @@ mem2hex(char *buf, unsigned char *mem, int count)
return (buf);
}
-/* Convert the array, in hexadecimal representation, pointed to by buf into
- binary representation. Put the result in mem, and return a pointer to
- the character after the last byte written. */
-static unsigned char*
-hex2mem (unsigned char *mem, char *buf, int count)
-{
- int i;
- unsigned char ch;
- for (i = 0; i < count; i++) {
- ch = hex (*buf++) << 4;
- ch = ch + hex (*buf++);
- *mem++ = ch;
- }
- return (mem);
-}
-
/* Put the content of the array, in binary representation, pointed to by buf
into memory pointed to by mem, and return a pointer to the character after
the last byte written.
@@ -964,7 +928,7 @@ handle_exception (int sigval)
Success: OK
Failure: void. */
#ifdef PROCESS_SUPPORT
- hex2mem ((unsigned char *)®_g,
&remcomInBuffer[1], sizeof(registers));
+ hex2bin((unsigned char *)®_g,
&remcomInBuffer[1], sizeof(registers));
if (current_thread_g == executing_task) {
copy_registers (®, ®_g,
sizeof(registers));
}
@@ -972,7 +936,7 @@ handle_exception (int sigval)
copy_registers_to_stack(current_thread_g, ®_g);
}
#else
- hex2mem((char *)®, &remcomInBuffer[1],
sizeof(registers));
+ hex2bin((char *)®, &remcomInBuffer[1],
sizeof(registers));
#endif
gdb_cris_strcpy (remcomOutBuffer, "OK");
break;
@@ -1053,7 +1017,7 @@ handle_exception (int sigval)
int length = gdb_cris_strtol(lenptr+1,
&dataptr, 16);
if (*lenptr == ',' && *dataptr == ':') {
if (remcomInBuffer[0] == 'M') {
- hex2mem(addr, dataptr +
1, length);
+ hex2bin(addr, dataptr +
1, length);
}
else /* X */ {
bin2mem(addr, dataptr +
1, length);
--
1.8.2.rc0.22.gb3600c3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
