remove gdb debugger jank

Author: braindigitalis

src/debugger.c

@@ -1,7 +1,6 @@
 #include <kernel.h>
 
 static symbol_t* symbol_table = NULL;
-uint32_t trace_thread_id = 0;
 static bool debug_signal = false;
 
 #define BT_IRQ_MARKER ((void*)0xFFFFffffFFFFff01ull)
@@ -18,201 +17,6 @@ void gdb_decode(char* out, const uint8_t* in, size_t len) {
 	out[len] = '\0';
 }
 
-
-void gdb_send_ack(uint32_t src_ip, uint16_t src_port)
-{
-	src_ip = htonl(src_ip);
-	udp_send_packet((uint8_t*)&src_ip, DEBUG_DST_PORT, src_port, "+", 1);
-}
-
-void gdb_send_packet(uint32_t src_ip, uint16_t src_port, const char* packet)
-{
-	src_ip = htonl(src_ip);
-	uint64_t checksum = 0;
-	const uint8_t* ptr = (const uint8_t*)packet + 1;
-	while (*ptr) {
-		checksum += *ptr++;
-	}
-	char p[strlen(packet) + 5];
-	snprintf(p, strlen(packet) + 5, "%s#%02x", packet, (uint8_t)checksum % 256);
-	udp_send_packet((uint8_t*)&src_ip, DEBUG_DST_PORT, src_port, p, strlen(p));
-}
-
-void gdb_send_nack(uint32_t src_ip, uint16_t src_port)
-{
-	src_ip = htonl(src_ip);
-	udp_send_packet((uint8_t*)&src_ip, DEBUG_DST_PORT, src_port, "-", 1);
-}
-
-void gdb_ack(uint32_t src_ip, uint16_t src_port)
-{
-}
-
-void gdb_retransmit(uint32_t src_ip, uint16_t src_port)
-{
-}
-
-void gdb_query(uint32_t src_ip, uint16_t src_port, const char* command)
-{
-	char cmd_first[strlen(command)];
-	int x = 0;
-	const char* p = command;
-	const char* rest = NULL;
-	while (*p && *p != ';' && *p != ':' && *p != '?') {
-		cmd_first[x++] = *p++;
-	}
-	cmd_first[x] = 0;
-	rest = p;
-	dprintf("GDB qcmd: '%s' '%s'\n", cmd_first, rest);
-	if (strcmp(cmd_first, "qSupported") == 0) {
-		//gdb_send_packet(src_ip, src_port, "$QSupported:multiprocess+;qXfer:exec-file:read;swbreak+;hwbreak+;fork-events+;exec-events+;vContSupported+;no-resumed+;memory-tagging+;xmlRegisters=i386");
-		gdb_send_packet(src_ip, src_port, "$PacketSize=1000;QNonStop-;QDisableRandomization+;qXfer:threads:read+;qXfer:features:read-;qXfer:exec-file:read+;vContSupported+;multiprocess+");
-	} else if (strcmp(cmd_first, "qTStatus") == 0) {
-		// Thread status
-		gdb_send_packet(src_ip, src_port, "$T0;tnotrun:0;tframes:0;tcreated:0;tfree:50*!;tsize:50*!;circular:0;disconn:0;starttime:0;stoptime:0;username:;notes::");
-	} else if (strcmp(cmd_first, "qTfV") == 0 || strcmp(cmd_first, "qTsV") == 0) {
-		// get list of trace vars
-		gdb_send_packet(src_ip, src_port, "$l");
-	} else if (strcmp(cmd_first, "qTfP") == 0 || strcmp(cmd_first, "qTsP") == 0) {
-		// get list of tracepoints
-		gdb_send_packet(src_ip, src_port, "$l");
-	} else if (strcmp(cmd_first, "qfThreadInfo") == 0) {
-		/* Thread ID list */
-		gdb_send_packet(src_ip, src_port, "$m1,2,3,4,5");
-	} else if (strcmp(cmd_first, "qsThreadInfo") == 0) {
-		gdb_send_packet(src_ip, src_port, "$l");
-	} else if (strcmp(cmd_first, "qAttached") == 0) {
-		// 1 if attached successfully to process, 0 if started a new process, Exx on error
-		gdb_send_packet(src_ip, src_port, "$1");
-	} else if (strcmp(cmd_first, "qC") == 0) {
-		// Return current thread id
-		gdb_send_packet(src_ip, src_port, "$QCp1.1");
-	} else if (strcmp(cmd_first, "qXfer") == 0) {
-		if (!strncmp(rest, ":exec-file:read:", 16)) {
-			gdb_send_packet(src_ip, src_port, "$l/programs/init");
-		} else if (!strncmp(rest, ":threads:read:", 14)) {
-			gdb_send_packet(src_ip, src_port, "$l<threads><thread id=\"p1.1\" core=\"0\" name=\"/programs/init\"/></threads>");
-		}
-	}
-}
-
-void gdb_variable_command(uint32_t src_ip, uint16_t src_port, const char* command)
-{
-	char cmd_first[strlen(command)];
-	int x = 0;
-	const char* p = command;
-	const char* rest = NULL;
-	while (*p && *p != ';' && *p != '?' && *p != ':') {
-		cmd_first[x++] = *p++;
-	}
-	cmd_first[x] = 0;
-	rest = p;
-	dprintf("GDB vcmd: '%s' '%s'\n", cmd_first, rest);
-	if (strcmp(cmd_first, "vMustReplyEmpty") == 0) {
-		gdb_send_packet(src_ip, src_port, "$");
-	} else if (strcmp(cmd_first, "vFile") == 0) {
-		// Host I/O: Not currently supported as it tries to download current executable!
-		gdb_send_packet(src_ip, src_port, "$");
-	}
-}
-
-void gdb_set_thread(uint32_t src_ip, uint16_t src_port, const char* command)
-{
-	const char op = command[1];
-	const char* thread_id = command + 2;
-	trace_thread_id = atoi(thread_id);
-	dprintf("GDB: set thread: op=%c thread_id=%s\n", op, thread_id);
-	gdb_send_packet(src_ip, src_port, "$OK");
-}
-
-void gdb_status_query(uint32_t src_ip, uint16_t src_port, const char* command)
-{
-	gdb_send_packet(src_ip, src_port, "$S01thread:p1.1");
-}
-
-void gdb_regs(uint32_t src_ip, uint16_t src_port, const char* command)
-{
-	gdb_send_packet(src_ip, src_port, "$xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-}
-
-void gdb_reg(uint32_t src_ip, uint16_t src_port, const char* command)
-{
-	if (*(command + 1) == '8') {
-		/* Program counter */
-		gdb_send_packet(src_ip, src_port, "$00000010");
-		return;
-	}
-	gdb_send_packet(src_ip, src_port, "$xxxxxxxx");
-}
-
-void gdb_mem(uint32_t src_ip, uint16_t src_port, const char* command)
-{
-	uint64_t count = hextoint(strchr(command + 1, ',') + 1);
-	char out[count * 2 + 2];
-	memset(out, '0', count * 2 + 2);
-	out[count * 2 + 1] = 0;
-	out[0] = '$';
-	dprintf("MEM (%d): %s\n", strlen(out), out);
-	gdb_send_packet(src_ip, src_port, out);
-}
-
-void gdb_command(uint32_t src_ip, uint16_t src_port, const char* command)
-{
-	dprintf("GDB: from '%04x:%04x' '%s'\n", src_ip, src_port, command);
-	gdb_send_ack(src_ip, src_port);
-	switch (*command) {
-		case 'q':
-			return gdb_query(src_ip, src_port, command);
-		case 'v':
-			return gdb_variable_command(src_ip, src_port, command);
-		case 'H':
-			return gdb_set_thread(src_ip, src_port, command);
-		case '?':
-			return gdb_status_query(src_ip, src_port, command);
-		case 'g':
-			return gdb_regs(src_ip, src_port, command);
-		case 'p':
-			return gdb_reg(src_ip, src_port, command);
-		case 'm':
-			return gdb_mem(src_ip, src_port, command);
-	}
-}
-
-void gdb_data(uint32_t src_ip, uint16_t src_port, uint8_t* data, uint32_t length)
-{
-	uint64_t checksum = 0, n = 0, their_sum = 0;
-	uint8_t* ptr = data;
-	char xsum[4] = { 0 };
-	char commands[length];
-	while (n < length && *ptr != '#') {
-		checksum += *ptr++;
-		++n;
-	}
-	++ptr;
-	strlcpy(xsum, (const char*)ptr, 3);
-	their_sum = hextoint(xsum);
-	checksum %= 256;
-	if (checksum == their_sum) {
-		strlcpy(commands, (const char*)data, n + 1);
-		gdb_command(src_ip, src_port, commands);
-	} else {
-		dprintf("GDB packet with invalid checksum: %lx vs %lx", their_sum, checksum);
-	}
-}
-
-void debug_handle_packet(uint32_t src_ip, uint16_t src_port, uint16_t dst_port, void* data, uint32_t length, void* opaque)
-{
-	uint8_t identifier = *(uint8_t*)data;
-	switch (identifier) {
-		case '+':
-			return gdb_ack(src_ip, src_port);
-		case '-':
-			return gdb_retransmit(src_ip, src_port);
-		case '$':
-			return gdb_data(src_ip, src_port, data + 1, length - 1);
-	}
-}
-
 bool set_debug_signal(bool status)
 {
 	bool old = debug_signal;
@@ -366,8 +170,6 @@ void init_debug()
 	kprintf("/kernel.sym ");
 	setforeground(COLOUR_WHITE);
 	kprintf("(%ld bytes)\n", filesize);
-
-	udp_register_daemon(DEBUG_DST_PORT, &debug_handle_packet, NULL);
 }
 
 const char* findsymbol(uint64_t address, uint64_t* offset) {

src/string.c

@@ -109,39 +109,9 @@ __attribute__((hot)) int strncmp(const char *s1, const char *s2, uint32_t n) {
 	return 0;
 }
 
-
 uint64_t hextoint(const char* n1)
 {
-	if (!n1) {
-		return 0;
-	}
-
-	uint32_t length = strlen(n1);
-	uint64_t result = 0;
-	int i = 0, fact = 1;
-
-	if (length) {
-		if (length > 16) {
-			length = 16;
-		}
-
-		for(i = length - 1; i >= 0; i--) {
-			char digit = tolower(*(n1 + i));
-			if ((digit >= '0' && digit <= '9') || (digit >= 'a' && digit <= 'f')) {
-				if (digit >= 97) {
-					result += (digit - 87) * fact;
-				} else {
-					result += (digit - 48) * fact;
-				}
-				fact <<= 4;
-			} else {
-				return 0;
-			}
-		}
-		return result;
-	}
-
-	return 0;
+	return atoll(n1, 16);
 }
 
 uint32_t strlcat(char *dst, const char *src, uint32_t siz)