|
@@ -798,7 +798,7 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
|
|
|
if ((u32) mem & 1 && count >= 1) {
|
|
|
if (gdbstub_read_byte(mem, ch) != 0)
|
|
|
return 0;
|
|
|
- buf = pack_hex_byte(buf, ch[0]);
|
|
|
+ buf = hex_byte_pack(buf, ch[0]);
|
|
|
mem++;
|
|
|
count--;
|
|
|
}
|
|
@@ -806,8 +806,8 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
|
|
|
if ((u32) mem & 3 && count >= 2) {
|
|
|
if (gdbstub_read_word(mem, ch) != 0)
|
|
|
return 0;
|
|
|
- buf = pack_hex_byte(buf, ch[0]);
|
|
|
- buf = pack_hex_byte(buf, ch[1]);
|
|
|
+ buf = hex_byte_pack(buf, ch[0]);
|
|
|
+ buf = hex_byte_pack(buf, ch[1]);
|
|
|
mem += 2;
|
|
|
count -= 2;
|
|
|
}
|
|
@@ -815,10 +815,10 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
|
|
|
while (count >= 4) {
|
|
|
if (gdbstub_read_dword(mem, ch) != 0)
|
|
|
return 0;
|
|
|
- buf = pack_hex_byte(buf, ch[0]);
|
|
|
- buf = pack_hex_byte(buf, ch[1]);
|
|
|
- buf = pack_hex_byte(buf, ch[2]);
|
|
|
- buf = pack_hex_byte(buf, ch[3]);
|
|
|
+ buf = hex_byte_pack(buf, ch[0]);
|
|
|
+ buf = hex_byte_pack(buf, ch[1]);
|
|
|
+ buf = hex_byte_pack(buf, ch[2]);
|
|
|
+ buf = hex_byte_pack(buf, ch[3]);
|
|
|
mem += 4;
|
|
|
count -= 4;
|
|
|
}
|
|
@@ -826,8 +826,8 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
|
|
|
if (count >= 2) {
|
|
|
if (gdbstub_read_word(mem, ch) != 0)
|
|
|
return 0;
|
|
|
- buf = pack_hex_byte(buf, ch[0]);
|
|
|
- buf = pack_hex_byte(buf, ch[1]);
|
|
|
+ buf = hex_byte_pack(buf, ch[0]);
|
|
|
+ buf = hex_byte_pack(buf, ch[1]);
|
|
|
mem += 2;
|
|
|
count -= 2;
|
|
|
}
|
|
@@ -835,7 +835,7 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
|
|
|
if (count >= 1) {
|
|
|
if (gdbstub_read_byte(mem, ch) != 0)
|
|
|
return 0;
|
|
|
- buf = pack_hex_byte(buf, ch[0]);
|
|
|
+ buf = hex_byte_pack(buf, ch[0]);
|
|
|
}
|
|
|
|
|
|
*buf = 0;
|
|
@@ -1273,13 +1273,13 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
|
|
|
ptr = mem2hex(title, ptr, sizeof(title) - 1, 0);
|
|
|
|
|
|
hx = hex_asc_hi(excep >> 8);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_lo(excep >> 8);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_hi(excep);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_lo(excep);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
|
|
|
ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0);
|
|
|
*ptr = 0;
|
|
@@ -1291,21 +1291,21 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
|
|
|
ptr = mem2hex(tbcberr, ptr, sizeof(tbcberr) - 1, 0);
|
|
|
|
|
|
hx = hex_asc_hi(bcberr >> 24);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_lo(bcberr >> 24);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_hi(bcberr >> 16);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_lo(bcberr >> 16);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_hi(bcberr >> 8);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_lo(bcberr >> 8);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_hi(bcberr);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
hx = hex_asc_lo(bcberr);
|
|
|
- ptr = pack_hex_byte(ptr, hx);
|
|
|
+ ptr = hex_byte_pack(ptr, hx);
|
|
|
|
|
|
ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0);
|
|
|
*ptr = 0;
|
|
@@ -1321,12 +1321,12 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
|
|
|
* Send trap type (converted to signal)
|
|
|
*/
|
|
|
*ptr++ = 'T';
|
|
|
- ptr = pack_hex_byte(ptr, sigval);
|
|
|
+ ptr = hex_byte_pack(ptr, sigval);
|
|
|
|
|
|
/*
|
|
|
* Send Error PC
|
|
|
*/
|
|
|
- ptr = pack_hex_byte(ptr, GDB_REGID_PC);
|
|
|
+ ptr = hex_byte_pack(ptr, GDB_REGID_PC);
|
|
|
*ptr++ = ':';
|
|
|
ptr = mem2hex(®s->pc, ptr, 4, 0);
|
|
|
*ptr++ = ';';
|
|
@@ -1334,7 +1334,7 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
|
|
|
/*
|
|
|
* Send frame pointer
|
|
|
*/
|
|
|
- ptr = pack_hex_byte(ptr, GDB_REGID_FP);
|
|
|
+ ptr = hex_byte_pack(ptr, GDB_REGID_FP);
|
|
|
*ptr++ = ':';
|
|
|
ptr = mem2hex(®s->a3, ptr, 4, 0);
|
|
|
*ptr++ = ';';
|
|
@@ -1343,7 +1343,7 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
|
|
|
* Send stack pointer
|
|
|
*/
|
|
|
ssp = (unsigned long) (regs + 1);
|
|
|
- ptr = pack_hex_byte(ptr, GDB_REGID_SP);
|
|
|
+ ptr = hex_byte_pack(ptr, GDB_REGID_SP);
|
|
|
*ptr++ = ':';
|
|
|
ptr = mem2hex(&ssp, ptr, 4, 0);
|
|
|
*ptr++ = ';';
|