Merge branch 'rmobile-mx' of git://git.denx.de/u-boot-sh

[people/ms/u-boot.git] / common / kgdb.c

diff --git a/common/kgdb.c b/common/kgdb.c
index 862f3684e2afbbda0cde825d8aaaacfe97d8833a..daf53bed7a9630133c659e0384307c480a8292b6 100644 (file)
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -1,4 +1,4 @@
-/* taken from arch/ppc/kernel/ppc-stub.c */
+/* taken from arch/powerpc/kernel/ppc-stub.c */
 
 /****************************************************************************
 
@@ -103,7 +103,7 @@ static char remcomOutBuffer[BUFMAX];
 static char remcomRegBuffer[BUFMAX];
 
 static int initialized = 0;
-static int kgdb_active = 0, first_entry = 1;
+static int kgdb_active;
 static struct pt_regs entry_regs;
 static long error_jmp_buf[BUFMAX/2];
 static int longjmp_on_fault = 0;
@@ -132,11 +132,20 @@ hex(unsigned char ch)
 static unsigned char *
 mem2hex(char *mem, char *buf, int count)
 {
+       char *tmp;
        unsigned char ch;
 
+       /*
+        * We use the upper half of buf as an intermediate buffer for the
+        * raw memory copy.  Hex conversion will work against this one.
+        */
+       tmp = buf + count;
        longjmp_on_fault = 1;
+
+       memcpy(tmp, mem, count);
+
        while (count-- > 0) {
-               ch = *mem++;
+               ch = *tmp++;
                *buf++ = hexchars[ch >> 4];
                *buf++ = hexchars[ch & 0xf];
        }
@@ -151,21 +160,33 @@ mem2hex(char *mem, char *buf, int count)
 static char *
 hex2mem(char *buf, char *mem, int count)
 {
-       int i, hexValue;
-       unsigned char ch;
-       char *mem_start = mem;
+       int hexValue;
+       char *tmp_raw, *tmp_hex;
+
+       /*
+        * We use the upper half of buf as an intermediate buffer for the
+        * raw memory that is converted from hex.
+        */
+       tmp_raw = buf + count * 2;
+       tmp_hex = tmp_raw - 1;
 
        longjmp_on_fault = 1;
-       for (i=0; i<count; i++) {
-               if ((hexValue = hex(*buf++)) < 0)
+       while (tmp_hex >= buf) {
+               tmp_raw--;
+               hexValue = hex(*tmp_hex--);
+               if (hexValue < 0)
                        kgdb_error(KGDBERR_NOTHEXDIG);
-               ch = hexValue << 4;
-               if ((hexValue = hex(*buf++)) < 0)
+               *tmp_raw = hexValue;
+               hexValue = hex(*tmp_hex--);
+               if (hexValue < 0)
                        kgdb_error(KGDBERR_NOTHEXDIG);
-               ch |= hexValue;
-               *mem++ = ch;
+               *tmp_raw |= hexValue << 4;
+
        }
-       kgdb_flush_cache_range((void *)mem_start, (void *)(mem - 1));
+
+       memcpy(mem, tmp_raw, count);
+
+       kgdb_flush_cache_range((void *)mem, (void *)(mem+count));
        longjmp_on_fault = 0;
 
        return buf;
@@ -305,7 +326,7 @@ handle_exception (struct pt_regs *regs)
                return (0);
        }
 
-       /* probably should check which exception occured as well */
+       /* probably should check which exception occurred as well */
        if (longjmp_on_fault) {
                longjmp_on_fault = 0;
                kgdb_longjmp(error_jmp_buf, KGDBERR_MEMFAULT);
@@ -327,16 +348,7 @@ handle_exception (struct pt_regs *regs)
 
        kgdb_enter(regs, &kd);
 
-       if (first_entry) {
-               /*
-                * the first time we enter kgdb, we save the processor
-                * state so that we can return to the monitor if the
-                * remote end quits gdb (or at least, tells us to quit
-                * with the 'k' packet)
-                */
-               entry_regs = *regs;
-               first_entry = 0;
-       }
+       entry_regs = *regs;
 
        ptr = remcomOutBuffer;
 
@@ -438,7 +450,6 @@ handle_exception (struct pt_regs *regs)
                case 'k':    /* kill the program, actually return to monitor */
                        kd.extype = KGDBEXIT_KILL;
                        *regs = entry_regs;
-                       first_entry = 1;
                        goto doexit;
 
                case 'C':    /* CSS  continue with signal SS */
@@ -563,7 +574,7 @@ breakpoint(void)
 }
 
 int
-do_kgdb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_kgdb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
     printf("Entering KGDB mode via exception handler...\n\n");
     kgdb_breakpoint(argc - 1, argv + 1);