Compare commits
2 Commits
c1158b547e
...
acb59994fc
Author | SHA1 | Date | |
---|---|---|---|
acb59994fc | |||
6d6a109a08 |
Submodule lib/zig-network updated: a8c4502538...45ae8cf0ce
@@ -4,6 +4,7 @@ const Packet = @import("Packet.zig");
|
||||
|
||||
const Socket = network.Socket;
|
||||
const Allocator = std.mem.Allocator;
|
||||
const Atomic = std.atomic.Atomic;
|
||||
const Emulator = @import("lib.zig").Emulator;
|
||||
|
||||
const Self = @This();
|
||||
@@ -94,16 +95,21 @@ const Action = union(enum) {
|
||||
nack,
|
||||
};
|
||||
|
||||
pub fn run(self: *Self, allocator: Allocator) !void {
|
||||
pub fn run(self: *Self, allocator: Allocator, quit: *Atomic(bool)) !void {
|
||||
var buf: [Packet.max_len]u8 = undefined;
|
||||
|
||||
while (true) {
|
||||
const len = try self.client.receive(&buf);
|
||||
if (len == 0) break;
|
||||
|
||||
if (quit.load(.Monotonic)) break;
|
||||
const action = try self.parse(allocator, buf[0..len]);
|
||||
try self.send(allocator, action);
|
||||
}
|
||||
|
||||
// Just in case its the gdbstub that exited first,
|
||||
// attempt to signal to the GUI that it should also exit
|
||||
quit.store(true, .Monotonic);
|
||||
}
|
||||
|
||||
fn parse(self: *Self, allocator: Allocator, input: []const u8) !Action {
|
||||
|
@@ -25,7 +25,7 @@ const SwBkpt = struct {
|
||||
}
|
||||
|
||||
pub fn deinit(self: *@This()) void {
|
||||
self.deinit();
|
||||
self.list.deinit();
|
||||
self.* = undefined;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ const SwBkpt = struct {
|
||||
}
|
||||
|
||||
pub fn remove(self: *@This(), addr: u32) void {
|
||||
for (self.list.items) |bkpt, i| {
|
||||
for (self.list.items, 0..) |bkpt, i| {
|
||||
if (bkpt.addr == addr) {
|
||||
_ = self.list.orderedRemove(i);
|
||||
log.debug("Removed Breakpoint at 0x{X:0>8}", .{addr});
|
||||
@@ -73,7 +73,7 @@ const HwBkpt = struct {
|
||||
}
|
||||
|
||||
pub fn add(self: *@This(), addr: u32, kind: u32) !void {
|
||||
for (self.list) |*bkpt_opt| {
|
||||
for (&self.list) |*bkpt_opt| {
|
||||
if (bkpt_opt.*) |bkpt| {
|
||||
if (bkpt.addr == addr) return; // idempotent
|
||||
} else {
|
||||
@@ -88,7 +88,7 @@ const HwBkpt = struct {
|
||||
}
|
||||
|
||||
pub fn remove(self: *@This(), addr: u32) void {
|
||||
for (self.list) |*bkpt_opt| {
|
||||
for (&self.list) |*bkpt_opt| {
|
||||
const bkpt = bkpt_opt.* orelse continue;
|
||||
|
||||
if (bkpt.addr == addr) {
|
||||
|
Reference in New Issue
Block a user