feat: update to Zig v0.13.0
This commit is contained in:
parent
bc47ff4883
commit
9a50607d5f
|
@ -1,2 +1,3 @@
|
||||||
zig-out/
|
zig-out/
|
||||||
zig-cache/
|
zig-cache/
|
||||||
|
.zig-cache/
|
||||||
|
|
18
build.zig
18
build.zig
|
@ -15,21 +15,21 @@ pub fn build(b: *std.Build) void {
|
||||||
// set a preferred release mode, allowing the user to decide how to optimize.
|
// set a preferred release mode, allowing the user to decide how to optimize.
|
||||||
const optimize = b.standardOptimizeOption(.{});
|
const optimize = b.standardOptimizeOption(.{});
|
||||||
|
|
||||||
_ = b.addModule("gdbstub", .{ .root_source_file = .{ .path = "src/lib.zig" } });
|
_ = b.addModule("zba-gdbstub", .{ .root_source_file = b.path("src/lib.zig") });
|
||||||
|
|
||||||
// Creates a step for unit testing. This only builds the test executable
|
// Creates a step for unit testing. This only builds the test executable
|
||||||
// but does not run it.
|
// but does not run it.
|
||||||
const tests = b.addTest(.{
|
const lib_unit_tests = b.addTest(.{
|
||||||
.root_source_file = .{ .path = "src/lib.zig" },
|
.root_source_file = b.path("src/lib.zig"),
|
||||||
.target = target,
|
.target = target,
|
||||||
.optimize = optimize,
|
.optimize = optimize,
|
||||||
});
|
});
|
||||||
|
|
||||||
const run_tests = b.addRunArtifact(tests);
|
const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests);
|
||||||
|
|
||||||
// This creates a build step. It will be visible in the `zig build --help` menu,
|
// Similar to creating the run step earlier, this exposes a `test` step to
|
||||||
// and can be selected like this: `zig build test`
|
// the `zig build --help` menu, providing a way for the user to request
|
||||||
// This will evaluate the `test` step rather than the default, which is "install".
|
// running the unit tests.
|
||||||
const test_step = b.step("test", "Run library tests");
|
const test_step = b.step("test", "Run unit tests");
|
||||||
test_step.dependOn(&run_tests.step);
|
test_step.dependOn(&run_lib_unit_tests.step);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,72 @@
|
||||||
.{
|
.{
|
||||||
|
// This is the default name used by packages depending on this one. For
|
||||||
|
// example, when a user runs `zig fetch --save <url>`, this field is used
|
||||||
|
// as the key in the `dependencies` table. Although the user can choose a
|
||||||
|
// different name, most users will stick with this provided value.
|
||||||
|
//
|
||||||
|
// It is redundant to include "zig" in this name because it is already
|
||||||
|
// within the Zig package namespace.
|
||||||
.name = "zba-gdbstub",
|
.name = "zba-gdbstub",
|
||||||
|
|
||||||
|
// This is a [Semantic Version](https://semver.org/).
|
||||||
|
// In a future version of Zig it will be used for package deduplication.
|
||||||
.version = "0.1.0",
|
.version = "0.1.0",
|
||||||
|
|
||||||
|
// This field is optional.
|
||||||
|
// This is currently advisory only; Zig does not yet do anything
|
||||||
|
// with this value.
|
||||||
|
//.minimum_zig_version = "0.11.0",
|
||||||
|
|
||||||
|
// This field is optional.
|
||||||
|
// Each dependency must either provide a `url` and `hash`, or a `path`.
|
||||||
|
// `zig build --fetch` can be used to fetch all dependencies of a package, recursively.
|
||||||
|
// Once all dependencies are fetched, `zig build` no longer requires
|
||||||
|
// internet connectivity.
|
||||||
|
.dependencies = .{
|
||||||
|
// See `zig fetch --save <url>` for a command-line interface for adding dependencies.
|
||||||
|
//.example = .{
|
||||||
|
// // When updating this field to a new URL, be sure to delete the corresponding
|
||||||
|
// // `hash`, otherwise you are communicating that you expect to find the old hash at
|
||||||
|
// // the new URL.
|
||||||
|
// .url = "https://example.com/foo.tar.gz",
|
||||||
|
//
|
||||||
|
// // This is computed from the file contents of the directory of files that is
|
||||||
|
// // obtained after fetching `url` and applying the inclusion rules given by
|
||||||
|
// // `paths`.
|
||||||
|
// //
|
||||||
|
// // This field is the source of truth; packages do not come from a `url`; they
|
||||||
|
// // come from a `hash`. `url` is just one of many possible mirrors for how to
|
||||||
|
// // obtain a package matching this `hash`.
|
||||||
|
// //
|
||||||
|
// // Uses the [multihash](https://multiformats.io/multihash/) format.
|
||||||
|
// .hash = "...",
|
||||||
|
//
|
||||||
|
// // When this is provided, the package is found in a directory relative to the
|
||||||
|
// // build root. In this case the package's hash is irrelevant and therefore not
|
||||||
|
// // computed. This field and `url` are mutually exclusive.
|
||||||
|
// .path = "foo",
|
||||||
|
|
||||||
|
// // When this is set to `true`, a package is declared to be lazily
|
||||||
|
// // fetched. This makes the dependency only get fetched if it is
|
||||||
|
// // actually used.
|
||||||
|
// .lazy = false,
|
||||||
|
//},
|
||||||
|
},
|
||||||
|
|
||||||
|
// Specifies the set of files and directories that are included in this package.
|
||||||
|
// Only files and directories listed here are included in the `hash` that
|
||||||
|
// is computed for this package. Only files listed here will remain on disk
|
||||||
|
// when using the zig package manager. As a rule of thumb, one should list
|
||||||
|
// files required for compilation plus any license(s).
|
||||||
|
// Paths are relative to the build root. Use the empty string (`""`) to refer to
|
||||||
|
// the build root itself.
|
||||||
|
// A directory listed here means that all files within, recursively, are included.
|
||||||
.paths = .{
|
.paths = .{
|
||||||
"build.zig",
|
"build.zig",
|
||||||
"build.zig.zon",
|
"build.zig.zon",
|
||||||
"src",
|
"src",
|
||||||
|
// For example...
|
||||||
|
//"LICENSE",
|
||||||
|
//"README.md",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,7 @@ const Packet = @import("Packet.zig");
|
||||||
const Emulator = @import("lib.zig").Emulator;
|
const Emulator = @import("lib.zig").Emulator;
|
||||||
|
|
||||||
const Allocator = std.mem.Allocator;
|
const Allocator = std.mem.Allocator;
|
||||||
const Server = std.net.StreamServer;
|
const Server = std.net.Server;
|
||||||
const Connection = Server.Connection;
|
|
||||||
|
|
||||||
const Self = @This();
|
const Self = @This();
|
||||||
const log = std.log.scoped(.Server);
|
const log = std.log.scoped(.Server);
|
||||||
|
@ -27,12 +26,11 @@ pub const State = struct {
|
||||||
const Xml = struct { target: []const u8, memory_map: ?[]const u8 };
|
const Xml = struct { target: []const u8, memory_map: ?[]const u8 };
|
||||||
|
|
||||||
pub fn init(emulator: Emulator, xml: Xml) !Self {
|
pub fn init(emulator: Emulator, xml: Xml) !Self {
|
||||||
var server = std.net.StreamServer.init(.{});
|
const localhost = std.net.Address.initIp4(.{ 127, 0, 0, 1 }, port);
|
||||||
try server.listen(std.net.Address.initIp4(.{ 127, 0, 0, 1 }, port));
|
|
||||||
|
|
||||||
return .{
|
return .{
|
||||||
.emu = emulator,
|
.emu = emulator,
|
||||||
.socket = server,
|
.socket = try localhost.listen(.{}),
|
||||||
.state = .{ .target_xml = xml.target, .memmap_xml = xml.memory_map },
|
.state = .{ .target_xml = xml.target, .memmap_xml = xml.memory_map },
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -58,11 +56,11 @@ pub fn run(self: *Self, allocator: Allocator, should_quit: *std.atomic.Value(boo
|
||||||
var client = try self.socket.accept();
|
var client = try self.socket.accept();
|
||||||
log.info("client connected from {}", .{client.address});
|
log.info("client connected from {}", .{client.address});
|
||||||
|
|
||||||
while (!should_quit.load(.Monotonic)) {
|
while (!should_quit.load(.monotonic)) {
|
||||||
if (self.state.should_quit) {
|
if (self.state.should_quit) {
|
||||||
// Just in case its the gdbstub that exited first,
|
// Just in case its the gdbstub that exited first,
|
||||||
// attempt to signal to the GUI that it should also exit
|
// attempt to signal to the GUI that it should also exit
|
||||||
should_quit.store(true, .Monotonic);
|
should_quit.store(true, .monotonic);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue