ElicMagus
/
microzig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to zig master: use @memset, @memcpy builtin (#128)

Browse Source 
Co-authored-by: Binary Craft <keep.it.sns@gmail.com>
wch-ch32v003
binarycraft007 1 year ago committed by GitHub
parent b5edf6da6b
commit 4e62e99e3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

16
src/core/usb.zig
Unescape Escape View File

@ -157,7 +157,7 @@ pub fn Usb(comptime f: anytype) type {
usb_config.?.endpoints[EP0_IN_IDX].next_pid_1 = true; usb_config.?.endpoints[EP0_IN_IDX].next_pid_1 = true;
const dc = usb_config.?.device_descriptor.serialize(); const dc = usb_config.?.device_descriptor.serialize();
std.mem.copy(u8, S.tmp[0..dc.len], &dc); @memcpy(S.tmp[0..dc.len], &dc);
// Configure EP0 IN to send the device descriptor // Configure EP0 IN to send the device descriptor
// when it's next asked. // when it's next asked.
@ -178,7 +178,7 @@ pub fn Usb(comptime f: anytype) type {
var used: usize = 0; var used: usize = 0;
const cd = usb_config.?.config_descriptor.serialize(); const cd = usb_config.?.config_descriptor.serialize();
std.mem.copy(u8, S.tmp[used .. used + cd.len], &cd); @memcpy(S.tmp[used .. used + cd.len], &cd);
used += cd.len; used += cd.len;
if (setup.length > used) { if (setup.length > used) {
@ -192,7 +192,7 @@ pub fn Usb(comptime f: anytype) type {
// (1) the exact size of a config descriptor, or // (1) the exact size of a config descriptor, or
// (2) 64 bytes, and this all fits in 64 bytes. // (2) 64 bytes, and this all fits in 64 bytes.
const id = usb_config.?.interface_descriptor.serialize(); const id = usb_config.?.interface_descriptor.serialize();
std.mem.copy(u8, S.tmp[used .. used + id.len], &id); @memcpy(S.tmp[used .. used + id.len], &id);
used += id.len; used += id.len;
// Seems like the host does not bother asking for the // Seems like the host does not bother asking for the
@ -200,7 +200,7 @@ pub fn Usb(comptime f: anytype) type {
// other descriptors. // other descriptors.
if (usb_config.?.hid) |hid_conf| { if (usb_config.?.hid) |hid_conf| {
const hd = hid_conf.hid_descriptor.serialize(); const hd = hid_conf.hid_descriptor.serialize();
std.mem.copy(u8, S.tmp[used .. used + hd.len], &hd); @memcpy(S.tmp[used .. used + hd.len], &hd);
used += hd.len; used += hd.len;
} }
@ -209,7 +209,7 @@ pub fn Usb(comptime f: anytype) type {
// into multiple packets // into multiple packets
for (usb_config.?.endpoints[2..]) |ep| { for (usb_config.?.endpoints[2..]) |ep| {
const ed = ep.descriptor.serialize(); const ed = ep.descriptor.serialize();
std.mem.copy(u8, S.tmp[used .. used + ed.len], &ed); @memcpy(S.tmp[used .. used + ed.len], &ed);
used += ed.len; used += ed.len;
} }
} }
@ -237,7 +237,7 @@ pub fn Usb(comptime f: anytype) type {
S.tmp[0] = @intCast(u8, len); S.tmp[0] = @intCast(u8, len);
S.tmp[1] = 0x03; S.tmp[1] = 0x03;
std.mem.copy(u8, S.tmp[2..len], s); @memcpy(S.tmp[2..len], s);
break :StringBlk S.tmp[0..len]; break :StringBlk S.tmp[0..len];
} }
@ -279,7 +279,7 @@ pub fn Usb(comptime f: anytype) type {
}; };
const data = dqd.serialize(); const data = dqd.serialize();
std.mem.copy(u8, S.tmp[0..data.len], &data); @memcpy(S.tmp[0..data.len], &data);
f.usb_start_tx( f.usb_start_tx(
usb_config.?.endpoints[EP0_IN_IDX], usb_config.?.endpoints[EP0_IN_IDX],
@ -299,7 +299,7 @@ pub fn Usb(comptime f: anytype) type {
if (debug) std.log.info(" HID", .{}); if (debug) std.log.info(" HID", .{});
const hd = hid_conf.hid_descriptor.serialize(); const hd = hid_conf.hid_descriptor.serialize();
std.mem.copy(u8, S.tmp[0..hd.len], &hd); @memcpy(S.tmp[0..hd.len], &hd);
f.usb_start_tx( f.usb_start_tx(
usb_config.?.endpoints[EP0_IN_IDX], usb_config.?.endpoints[EP0_IN_IDX],

4
src/modules/cpus/cortex-m.zig
Unescape Escape View File

@ -84,7 +84,7 @@ pub const startup_logic = struct {
const bss_end = @ptrCast([*]u8, &microzig_bss_end); const bss_end = @ptrCast([*]u8, &microzig_bss_end);
const bss_len = @ptrToInt(bss_end) - @ptrToInt(bss_start); const bss_len = @ptrToInt(bss_end) - @ptrToInt(bss_start);
std.mem.set(u8, bss_start[0..bss_len], 0); @memset(bss_start[0..bss_len], 0);
} }
// load .data from flash // load .data from flash
@ -94,7 +94,7 @@ pub const startup_logic = struct {
const data_len = @ptrToInt(data_end) - @ptrToInt(data_start); const data_len = @ptrToInt(data_end) - @ptrToInt(data_start);
const data_src = @ptrCast([*]const u8, &microzig_data_load_start); const data_src = @ptrCast([*]const u8, &microzig_data_load_start);
std.mem.copy(u8, data_start[0..data_len], data_src[0..data_len]); @memcpy(data_start[0..data_len], data_src[0..data_len]);
} }
microzig_main(); microzig_main();

4
src/modules/cpus/riscv32.zig
Unescape Escape View File

@ -61,7 +61,7 @@ pub const startup_logic = struct {
const bss_end = @ptrCast([*]u8, &microzig_bss_end); const bss_end = @ptrCast([*]u8, &microzig_bss_end);
const bss_len = @ptrToInt(bss_end) - @ptrToInt(bss_start); const bss_len = @ptrToInt(bss_end) - @ptrToInt(bss_start);
std.mem.set(u8, bss_start[0..bss_len], 0); @memset(bss_start[0..bss_len], 0);
} }
// load .data from flash // load .data from flash
@ -71,7 +71,7 @@ pub const startup_logic = struct {
const data_len = @ptrToInt(data_end) - @ptrToInt(data_start); const data_len = @ptrToInt(data_end) - @ptrToInt(data_start);
const data_src = @ptrCast([*]const u8, &microzig_data_load_start); const data_src = @ptrCast([*]const u8, &microzig_data_load_start);
std.mem.copy(u8, data_start[0..data_len], data_src[0..data_len]); @memcpy(data_start[0..data_len], data_src[0..data_len]);
} }
microzig_main(); microzig_main();

4
src/start.zig
Unescape Escape View File

@ -143,7 +143,7 @@ pub fn initialize_system_memories() void {
const bss_end = @ptrCast([*]u8, &sections.microzig_bss_end); const bss_end = @ptrCast([*]u8, &sections.microzig_bss_end);
const bss_len = @ptrToInt(bss_end) - @ptrToInt(bss_start); const bss_len = @ptrToInt(bss_end) - @ptrToInt(bss_start);
std.mem.set(u8, bss_start[0..bss_len], 0); @memset(bss_start[0..bss_len], 0);
} }
// load .data from flash // load .data from flash
@ -153,6 +153,6 @@ pub fn initialize_system_memories() void {
const data_len = @ptrToInt(data_end) - @ptrToInt(data_start); const data_len = @ptrToInt(data_end) - @ptrToInt(data_start);
const data_src = @ptrCast([*]const u8, &sections.microzig_data_load_start); const data_src = @ptrCast([*]const u8, &sections.microzig_data_load_start);
std.mem.copy(u8, data_start[0..data_len], data_src[0..data_len]); @memcpy(data_start[0..data_len], data_src[0..data_len]);
} }
} }

Write Preview
Loading…
Cancel
Save