X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=gdbstub.c;h=19623102ded716588d28011ec2f4d374a4ff639d;hb=9fddaa0c0cabb610947146a79b4a9a38b0a216e5;hp=bb3fed94683a525bfa2a1ced1897c5c4bece1366;hpb=03a6c5103d1a4c139cc28c8bb05a5752df4ee200;p=qemu diff --git a/gdbstub.c b/gdbstub.c index bb3fed9..1962310 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -17,81 +17,39 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include -#include -#include +#include "vl.h" + #include #include #include #include -#include "config.h" -#include "cpu.h" -#include "thunk.h" -#include "exec-all.h" - //#define DEBUG_GDB -int gdbstub_fd = -1; - -/* return 0 if OK */ -static int gdbstub_open(int port) -{ - struct sockaddr_in sockaddr; - socklen_t len; - int fd, val, ret; +enum RSState { + RS_IDLE, + RS_GETLINE, + RS_CHKSUM1, + RS_CHKSUM2, +}; - fd = socket(PF_INET, SOCK_STREAM, 0); - if (fd < 0) { - perror("socket"); - return -1; - } - - /* allow fast reuse */ - val = 1; - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); +static int gdbserver_fd; - sockaddr.sin_family = AF_INET; - sockaddr.sin_port = htons(port); - sockaddr.sin_addr.s_addr = 0; - ret = bind(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); - if (ret < 0) { - perror("bind"); - return -1; - } - ret = listen(fd, 0); - if (ret < 0) { - perror("listen"); - return -1; - } - - /* now wait for one connection */ - for(;;) { - len = sizeof(sockaddr); - gdbstub_fd = accept(fd, (struct sockaddr *)&sockaddr, &len); - if (gdbstub_fd < 0 && errno != EINTR) { - perror("accept"); - return -1; - } else if (gdbstub_fd >= 0) { - break; - } - } - - /* set short latency */ - val = 1; - setsockopt(gdbstub_fd, SOL_TCP, TCP_NODELAY, &val, sizeof(val)); - return 0; -} +typedef struct GDBState { + enum RSState state; + int fd; + char line_buf[4096]; + int line_buf_index; + int line_csum; +} GDBState; -static int get_char(void) +static int get_char(GDBState *s) { uint8_t ch; int ret; for(;;) { - ret = read(gdbstub_fd, &ch, 1); + ret = read(s->fd, &ch, 1); if (ret < 0) { if (errno != EINTR && errno != EAGAIN) return -1; @@ -104,12 +62,12 @@ static int get_char(void) return ch; } -static void put_buffer(const uint8_t *buf, int len) +static void put_buffer(GDBState *s, const uint8_t *buf, int len) { int ret; while (len > 0) { - ret = write(gdbstub_fd, buf, len); + ret = write(s->fd, buf, len); if (ret < 0) { if (errno != EINTR && errno != EAGAIN) return; @@ -163,59 +121,8 @@ static void hextomem(uint8_t *mem, const char *buf, int len) } } -/* return -1 if error or EOF */ -static int get_packet(char *buf, int buf_size) -{ - int ch, len, csum, csum1; - char reply[1]; - - for(;;) { - for(;;) { - ch = get_char(); - if (ch < 0) - return -1; - if (ch == '$') - break; - } - len = 0; - csum = 0; - for(;;) { - ch = get_char(); - if (ch < 0) - return -1; - if (ch == '#') - break; - if (len > buf_size - 1) - return -1; - buf[len++] = ch; - csum += ch; - } - buf[len] = '\0'; - ch = get_char(); - if (ch < 0) - return -1; - csum1 = fromhex(ch) << 4; - ch = get_char(); - if (ch < 0) - return -1; - csum1 |= fromhex(ch); - if ((csum & 0xff) != csum1) { - reply[0] = '-'; - put_buffer(reply, 1); - } else { - reply[0] = '+'; - put_buffer(reply, 1); - break; - } - } -#ifdef DEBUG_GDB - printf("command='%s'\n", buf); -#endif - return len; -} - /* return -1 if error, 0 if OK */ -static int put_packet(char *buf) +static int put_packet(GDBState *s, char *buf) { char buf1[3]; int len, csum, ch, i; @@ -226,9 +133,9 @@ static int put_packet(char *buf) for(;;) { buf1[0] = '$'; - put_buffer(buf1, 1); + put_buffer(s, buf1, 1); len = strlen(buf); - put_buffer(buf, len); + put_buffer(s, buf, len); csum = 0; for(i = 0; i < len; i++) { csum += buf[i]; @@ -237,9 +144,9 @@ static int put_packet(char *buf) buf1[1] = tohex((csum >> 4) & 0xf); buf1[2] = tohex((csum) & 0xf); - put_buffer(buf1, 3); + put_buffer(s, buf1, 3); - ch = get_char(); + ch = get_char(s); if (ch < 0) return -1; if (ch == '+') @@ -248,126 +155,57 @@ static int put_packet(char *buf) return 0; } -static int memory_rw(uint8_t *buf, uint32_t addr, int len, int is_write) +#if defined(TARGET_I386) + +static void to_le32(uint8_t *p, int v) { - int l, flags; - uint32_t page; + p[0] = v; + p[1] = v >> 8; + p[2] = v >> 16; + p[3] = v >> 24; +} - while (len > 0) { - page = addr & TARGET_PAGE_MASK; - l = (page + TARGET_PAGE_SIZE) - addr; - if (l > len) - l = len; - flags = page_get_flags(page); - if (!(flags & PAGE_VALID)) - return -1; - if (is_write) { - if (!(flags & PAGE_WRITE)) - return -1; - memcpy((uint8_t *)addr, buf, l); - } else { - if (!(flags & PAGE_READ)) - return -1; - memcpy(buf, (uint8_t *)addr, l); - } - len -= l; - buf += l; - addr += l; +static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf) +{ + int i, fpus; + + for(i = 0; i < 8; i++) { + to_le32(mem_buf + i * 4, env->regs[i]); } - return 0; + to_le32(mem_buf + 8 * 4, env->eip); + to_le32(mem_buf + 9 * 4, env->eflags); + to_le32(mem_buf + 10 * 4, env->segs[R_CS].selector); + to_le32(mem_buf + 11 * 4, env->segs[R_SS].selector); + to_le32(mem_buf + 12 * 4, env->segs[R_DS].selector); + to_le32(mem_buf + 13 * 4, env->segs[R_ES].selector); + to_le32(mem_buf + 14 * 4, env->segs[R_FS].selector); + to_le32(mem_buf + 15 * 4, env->segs[R_GS].selector); + /* XXX: convert floats */ + for(i = 0; i < 8; i++) { + memcpy(mem_buf + 16 * 4 + i * 10, &env->fpregs[i], 10); + } + to_le32(mem_buf + 36 * 4, env->fpuc); + fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11; + to_le32(mem_buf + 37 * 4, fpus); + to_le32(mem_buf + 38 * 4, 0); /* XXX: convert tags */ + to_le32(mem_buf + 39 * 4, 0); /* fiseg */ + to_le32(mem_buf + 40 * 4, 0); /* fioff */ + to_le32(mem_buf + 41 * 4, 0); /* foseg */ + to_le32(mem_buf + 42 * 4, 0); /* fooff */ + to_le32(mem_buf + 43 * 4, 0); /* fop */ + return 44 * 4; } -/* port = 0 means default port */ -int cpu_gdbstub(void *opaque, int (*main_loop)(void *opaque), int port) +static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size) { - CPUState *env; - const char *p; - int ret, ch, nb_regs, i, type; - char buf[4096]; - uint8_t mem_buf[2000]; - uint32_t *registers; - uint32_t addr, len; - - printf("Waiting gdb connection on port %d\n", port); - if (gdbstub_open(port) < 0) - return -1; - printf("Connected\n"); - for(;;) { - ret = get_packet(buf, sizeof(buf)); - if (ret < 0) - break; - p = buf; - ch = *p++; - switch(ch) { - case '?': - snprintf(buf, sizeof(buf), "S%02x", SIGTRAP); - put_packet(buf); - break; - case 'c': - if (*p != '\0') { - addr = strtoul(p, (char **)&p, 16); - env = cpu_gdbstub_get_env(opaque); -#if defined(TARGET_I386) - env->eip = addr; -#endif - } - ret = main_loop(opaque); - if (ret == EXCP_DEBUG) - ret = SIGTRAP; - else - ret = 0; - snprintf(buf, sizeof(buf), "S%02x", ret); - put_packet(buf); - break; - case 's': - env = cpu_gdbstub_get_env(opaque); - if (*p != '\0') { - addr = strtoul(p, (char **)&p, 16); -#if defined(TARGET_I386) - env->eip = addr; -#endif - } - cpu_single_step(env, 1); - ret = main_loop(opaque); - cpu_single_step(env, 0); - if (ret == EXCP_DEBUG) - ret = SIGTRAP; - else - ret = 0; - snprintf(buf, sizeof(buf), "S%02x", ret); - put_packet(buf); - break; - case 'g': - env = cpu_gdbstub_get_env(opaque); - registers = (void *)mem_buf; -#if defined(TARGET_I386) - for(i = 0; i < 8; i++) { - registers[i] = tswapl(env->regs[i]); - } - registers[8] = env->eip; - registers[9] = env->eflags; - registers[10] = env->segs[R_CS].selector; - registers[11] = env->segs[R_SS].selector; - registers[12] = env->segs[R_DS].selector; - registers[13] = env->segs[R_ES].selector; - registers[14] = env->segs[R_FS].selector; - registers[15] = env->segs[R_GS].selector; - nb_regs = 16; -#endif - memtohex(buf, (const uint8_t *)registers, - sizeof(registers[0]) * nb_regs); - put_packet(buf); - break; - case 'G': - env = cpu_gdbstub_get_env(opaque); - registers = (void *)mem_buf; -#if defined(TARGET_I386) - hextomem((uint8_t *)registers, p, 16 * 4); - for(i = 0; i < 8; i++) { - env->regs[i] = tswapl(registers[i]); - } - env->eip = registers[8]; - env->eflags = registers[9]; + uint32_t *registers = (uint32_t *)mem_buf; + int i; + + for(i = 0; i < 8; i++) { + env->regs[i] = tswapl(registers[i]); + } + env->eip = registers[8]; + env->eflags = registers[9]; #if defined(CONFIG_USER_ONLY) #define LOAD_SEG(index, sreg)\ if (tswapl(registers[index]) != env->segs[sreg].selector)\ @@ -379,89 +217,379 @@ int cpu_gdbstub(void *opaque, int (*main_loop)(void *opaque), int port) LOAD_SEG(14, R_FS); LOAD_SEG(15, R_GS); #endif +} + +#elif defined (TARGET_PPC) +static void to_le32(uint32_t *buf, uint32_t v) +{ + uint8_t *p = (uint8_t *)buf; + p[3] = v; + p[2] = v >> 8; + p[1] = v >> 16; + p[0] = v >> 24; +} + +static uint32_t from_le32 (uint32_t *buf) +{ + uint8_t *p = (uint8_t *)buf; + + return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); +} + +static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf) +{ + uint32_t *registers = (uint32_t *)mem_buf, tmp; + int i; + + /* fill in gprs */ + for(i = 0; i < 32; i++) { + to_le32(®isters[i], env->gpr[i]); + } + /* fill in fprs */ + for (i = 0; i < 32; i++) { + to_le32(®isters[(i * 2) + 32], *((uint32_t *)&env->fpr[i])); + to_le32(®isters[(i * 2) + 33], *((uint32_t *)&env->fpr[i] + 1)); + } + /* nip, msr, ccr, lnk, ctr, xer, mq */ + to_le32(®isters[96], (uint32_t)env->nip/* - 4*/); + to_le32(®isters[97], _load_msr(env)); + tmp = 0; + for (i = 0; i < 8; i++) + tmp |= env->crf[i] << (32 - ((i + 1) * 4)); + to_le32(®isters[98], tmp); + to_le32(®isters[99], env->lr); + to_le32(®isters[100], env->ctr); + to_le32(®isters[101], _load_xer(env)); + to_le32(®isters[102], 0); + + return 103 * 4; +} + +static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size) +{ + uint32_t *registers = (uint32_t *)mem_buf; + int i; + + /* fill in gprs */ + for (i = 0; i < 32; i++) { + env->gpr[i] = from_le32(®isters[i]); + } + /* fill in fprs */ + for (i = 0; i < 32; i++) { + *((uint32_t *)&env->fpr[i]) = from_le32(®isters[(i * 2) + 32]); + *((uint32_t *)&env->fpr[i] + 1) = from_le32(®isters[(i * 2) + 33]); + } + /* nip, msr, ccr, lnk, ctr, xer, mq */ + env->nip = from_le32(®isters[96]); + _store_msr(env, from_le32(®isters[97])); + registers[98] = from_le32(®isters[98]); + for (i = 0; i < 8; i++) + env->crf[i] = (registers[98] >> (32 - ((i + 1) * 4))) & 0xF; + env->lr = from_le32(®isters[99]); + env->ctr = from_le32(®isters[100]); + _store_xer(env, from_le32(®isters[101])); +} +#else + +static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf) +{ + return 0; +} + +static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size) +{ +} + +#endif + +/* port = 0 means default port */ +static int gdb_handle_packet(GDBState *s, const char *line_buf) +{ + CPUState *env = cpu_single_env; + const char *p; + int ch, reg_size, type; + char buf[4096]; + uint8_t mem_buf[2000]; + uint32_t *registers; + uint32_t addr, len; + +#ifdef DEBUG_GDB + printf("command='%s'\n", line_buf); #endif - put_packet("OK"); - break; - case 'm': - addr = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; - len = strtoul(p, NULL, 16); - if (memory_rw(mem_buf, addr, len, 0) != 0) - memset(mem_buf, 0, len); - memtohex(buf, mem_buf, len); - put_packet(buf); - break; - case 'M': + p = line_buf; + ch = *p++; + switch(ch) { + case '?': + snprintf(buf, sizeof(buf), "S%02x", SIGTRAP); + put_packet(s, buf); + break; + case 'c': + if (*p != '\0') { addr = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; - len = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; - hextomem(mem_buf, p, len); - if (memory_rw(mem_buf, addr, len, 1) != 0) - put_packet("ENN"); - else - put_packet("OK"); - break; - case 'Z': - type = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; +#if defined(TARGET_I386) + env->eip = addr; +#elif defined (TARGET_PPC) + env->nip = addr; +#endif + } + vm_start(); + break; + case 's': + if (*p != '\0') { addr = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; - len = strtoul(p, (char **)&p, 16); - if (type == 0 || type == 1) { - env = cpu_gdbstub_get_env(opaque); - if (cpu_breakpoint_insert(env, addr) < 0) - goto breakpoint_error; - put_packet("OK"); - } else { - breakpoint_error: - put_packet("ENN"); +#if defined(TARGET_I386) + env->eip = addr; +#elif defined (TARGET_PPC) + env->nip = addr; +#endif + } + cpu_single_step(env, 1); + vm_start(); + break; + case 'g': + reg_size = cpu_gdb_read_registers(env, mem_buf); + memtohex(buf, mem_buf, reg_size); + put_packet(s, buf); + break; + case 'G': + registers = (void *)mem_buf; + len = strlen(p) / 2; + hextomem((uint8_t *)registers, p, len); + cpu_gdb_write_registers(env, mem_buf, len); + put_packet(s, "OK"); + break; + case 'm': + addr = strtoul(p, (char **)&p, 16); + if (*p == ',') + p++; + len = strtoul(p, NULL, 16); + if (cpu_memory_rw_debug(env, addr, mem_buf, len, 0) != 0) + memset(mem_buf, 0, len); + memtohex(buf, mem_buf, len); + put_packet(s, buf); + break; + case 'M': + addr = strtoul(p, (char **)&p, 16); + if (*p == ',') + p++; + len = strtoul(p, (char **)&p, 16); + if (*p == ',') + p++; + hextomem(mem_buf, p, len); + if (cpu_memory_rw_debug(env, addr, mem_buf, len, 1) != 0) + put_packet(s, "ENN"); + else + put_packet(s, "OK"); + break; + case 'Z': + type = strtoul(p, (char **)&p, 16); + if (*p == ',') + p++; + addr = strtoul(p, (char **)&p, 16); + if (*p == ',') + p++; + len = strtoul(p, (char **)&p, 16); + if (type == 0 || type == 1) { + if (cpu_breakpoint_insert(env, addr) < 0) + goto breakpoint_error; + put_packet(s, "OK"); + } else { + breakpoint_error: + put_packet(s, "ENN"); + } + break; + case 'z': + type = strtoul(p, (char **)&p, 16); + if (*p == ',') + p++; + addr = strtoul(p, (char **)&p, 16); + if (*p == ',') + p++; + len = strtoul(p, (char **)&p, 16); + if (type == 0 || type == 1) { + cpu_breakpoint_remove(env, addr); + put_packet(s, "OK"); + } else { + goto breakpoint_error; + } + break; + default: + // unknown_command: + /* put empty packet */ + buf[0] = '\0'; + put_packet(s, buf); + break; + } + return RS_IDLE; +} + +static void gdb_vm_stopped(void *opaque, int reason) +{ + GDBState *s = opaque; + char buf[256]; + int ret; + + /* disable single step if it was enable */ + cpu_single_step(cpu_single_env, 0); + + if (reason == EXCP_DEBUG) + ret = SIGTRAP; + else + ret = 0; + snprintf(buf, sizeof(buf), "S%02x", ret); + put_packet(s, buf); +} + +static void gdb_read_byte(GDBState *s, int ch) +{ + int i, csum; + char reply[1]; + + if (vm_running) { + /* when the CPU is running, we cannot do anything except stop + it when receiving a char */ + vm_stop(EXCP_INTERRUPT); + } else { + switch(s->state) { + case RS_IDLE: + if (ch == '$') { + s->line_buf_index = 0; + s->state = RS_GETLINE; } break; - case 'z': - type = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; - addr = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; - len = strtoul(p, (char **)&p, 16); - if (type == 0 || type == 1) { - env = cpu_gdbstub_get_env(opaque); - cpu_breakpoint_remove(env, addr); - put_packet("OK"); + case RS_GETLINE: + if (ch == '#') { + s->state = RS_CHKSUM1; + } else if (s->line_buf_index >= sizeof(s->line_buf) - 1) { + s->state = RS_IDLE; } else { - goto breakpoint_error; + s->line_buf[s->line_buf_index++] = ch; } break; - case 'Q': - if (!strncmp(p, "Tinit", 5)) { - /* init traces */ - put_packet("OK"); - } else if (!strncmp(p, "TStart", 6)) { - /* start log (gdb 'tstart' command) */ - cpu_set_log(CPU_LOG_ALL); - put_packet("OK"); - } else if (!strncmp(p, "TStop", 5)) { - /* stop log (gdb 'tstop' command) */ - cpu_set_log(0); - put_packet("OK"); + case RS_CHKSUM1: + s->line_buf[s->line_buf_index] = '\0'; + s->line_csum = fromhex(ch) << 4; + s->state = RS_CHKSUM2; + break; + case RS_CHKSUM2: + s->line_csum |= fromhex(ch); + csum = 0; + for(i = 0; i < s->line_buf_index; i++) { + csum += s->line_buf[i]; + } + if (s->line_csum != (csum & 0xff)) { + reply[0] = '-'; + put_buffer(s, reply, 1); + s->state = RS_IDLE; } else { - goto unknown_command; + reply[0] = '+'; + put_buffer(s, reply, 1); + s->state = gdb_handle_packet(s, s->line_buf); } break; - default: - unknown_command: - /* put empty packet */ - buf[0] = '\0'; - put_packet(buf); + } + } +} + +static int gdb_can_read(void *opaque) +{ + return 256; +} + +static void gdb_read(void *opaque, const uint8_t *buf, int size) +{ + GDBState *s = opaque; + int i; + if (size == 0) { + /* end of connection */ + qemu_del_vm_stop_handler(gdb_vm_stopped, s); + qemu_del_fd_read_handler(s->fd); + qemu_free(s); + vm_start(); + } else { + for(i = 0; i < size; i++) + gdb_read_byte(s, buf[i]); + } +} + +static void gdb_accept(void *opaque, const uint8_t *buf, int size) +{ + GDBState *s; + struct sockaddr_in sockaddr; + socklen_t len; + int val, fd; + + for(;;) { + len = sizeof(sockaddr); + fd = accept(gdbserver_fd, (struct sockaddr *)&sockaddr, &len); + if (fd < 0 && errno != EINTR) { + perror("accept"); + return; + } else if (fd >= 0) { break; } } + + /* set short latency */ + val = 1; + setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)); + + s = qemu_mallocz(sizeof(GDBState)); + if (!s) { + close(fd); + return; + } + s->fd = fd; + + fcntl(fd, F_SETFL, O_NONBLOCK); + + /* stop the VM */ + vm_stop(EXCP_INTERRUPT); + + /* start handling I/O */ + qemu_add_fd_read_handler(s->fd, gdb_can_read, gdb_read, s); + /* when the VM is stopped, the following callback is called */ + qemu_add_vm_stop_handler(gdb_vm_stopped, s); +} + +static int gdbserver_open(int port) +{ + struct sockaddr_in sockaddr; + int fd, val, ret; + + fd = socket(PF_INET, SOCK_STREAM, 0); + if (fd < 0) { + perror("socket"); + return -1; + } + + /* allow fast reuse */ + val = 1; + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); + + sockaddr.sin_family = AF_INET; + sockaddr.sin_port = htons(port); + sockaddr.sin_addr.s_addr = 0; + ret = bind(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); + if (ret < 0) { + perror("bind"); + return -1; + } + ret = listen(fd, 0); + if (ret < 0) { + perror("listen"); + return -1; + } + fcntl(fd, F_SETFL, O_NONBLOCK); + return fd; +} + +int gdbserver_start(int port) +{ + gdbserver_fd = gdbserver_open(port); + if (gdbserver_fd < 0) + return -1; + /* accept connections */ + qemu_add_fd_read_handler(gdbserver_fd, NULL, gdb_accept, NULL); return 0; }