Skip to content

Commit ef08438

Browse files
committed
ci: vfmt vlib/v2
1 parent d1bb591 commit ef08438

3 files changed

Lines changed: 38 additions & 19 deletions

File tree

‎vlib/v2/gen/arm64/arm64.v‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pub struct Gen {
1111
mod &ssa.Module
1212
mut:
1313
macho &MachOObject
14-
1514
pub mut:
1615
stack_map map[int]int
1716
alloca_offsets map[int]int
@@ -414,7 +413,8 @@ fn (mut g Gen) gen_instr(val_id int) {
414413

415414
// Call function
416415
sym_idx := g.macho.add_undefined('_' + fn_name)
417-
g.macho.add_reloc(g.macho.text_data.len, sym_idx, arm64_reloc_branch26, true)
416+
g.macho.add_reloc(g.macho.text_data.len, sym_idx, arm64_reloc_branch26,
417+
true)
418418
g.emit(0x94000000)
419419

420420
// Restore stack
@@ -437,7 +437,8 @@ fn (mut g Gen) gen_instr(val_id int) {
437437
}
438438

439439
sym_idx := g.macho.add_undefined('_' + fn_name)
440-
g.macho.add_reloc(g.macho.text_data.len, sym_idx, arm64_reloc_branch26, true)
440+
g.macho.add_reloc(g.macho.text_data.len, sym_idx, arm64_reloc_branch26,
441+
true)
441442
g.emit(0x94000000)
442443
}
443444

@@ -834,10 +835,18 @@ fn (g Gen) type_size(typ_id ssa.TypeID) int {
834835
}
835836
typ := g.mod.type_store.types[typ_id]
836837
match typ.kind {
837-
.void_t { return 0 }
838-
.int_t { return if typ.width > 0 { (typ.width + 7) / 8 } else { 8 } }
839-
.float_t { return if typ.width > 0 { (typ.width + 7) / 8 } else { 8 } }
840-
.ptr_t { return 8 } // 64-bit pointers on arm64
838+
.void_t {
839+
return 0
840+
}
841+
.int_t {
842+
return if typ.width > 0 { (typ.width + 7) / 8 } else { 8 }
843+
}
844+
.float_t {
845+
return if typ.width > 0 { (typ.width + 7) / 8 } else { 8 }
846+
}
847+
.ptr_t {
848+
return 8
849+
} // 64-bit pointers on arm64
841850
.array_t {
842851
elem_size := g.type_size(typ.elem_type)
843852
return typ.len * elem_size
@@ -857,9 +866,15 @@ fn (g Gen) type_size(typ_id ssa.TypeID) int {
857866
}
858867
return if total > 0 { total } else { 8 }
859868
}
860-
.func_t { return 8 } // function pointer
861-
.label_t { return 0 }
862-
.metadata_t { return 0 }
869+
.func_t {
870+
return 8
871+
} // function pointer
872+
.label_t {
873+
return 0
874+
}
875+
.metadata_t {
876+
return 0
877+
}
863878
}
864879
}
865880

‎vlib/v2/gen/arm64/linker.v‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ const csmagic_blobwrapper = u32(0xfade0b01)
2828
const csslot_codedirectory = u32(0)
2929
const csslot_requirements = u32(2)
3030
const csslot_cms_signature = u32(0x10000)
31-
const cs_adhoc = u32(0x2) // Ad-hoc signing flag
31+
const cs_adhoc = u32(0x2) // Ad-hoc signing flag
3232
const cs_hashtype_sha256 = u8(2)
33-
const cs_hash_size = 32 // SHA256 = 32 bytes
34-
const cs_page_size_arm64 = 16384 // Code signing page size for ARM64 macOS
35-
const cs_page_shift_arm64 = 14 // log2(16384)
33+
const cs_hash_size = 32 // SHA256 = 32 bytes
34+
const cs_page_size_arm64 = 16384 // Code signing page size for ARM64 macOS
35+
const cs_page_shift_arm64 = 14 // log2(16384)
3636

3737
// ARM64 page size on macOS
3838
const page_size = 0x4000 // 16KB
@@ -155,7 +155,7 @@ pub fn (mut l Linker) link(output_path string, entry_name string) {
155155
// Header (32) + load_cmds (~700) + codesign reserve (600) ≈ 1332, align to 2048
156156
header_size := 32
157157
code_start_min := header_size + load_cmds_size + 600 // Reserve for codesign
158-
l.code_start = (code_start_min + 15) & ~15 // Align to 16 bytes
158+
l.code_start = (code_start_min + 15) & ~15 // Align to 16 bytes
159159

160160
// Calculate where stubs will be (after code and cstrings)
161161
l.stubs_offset = l.code_start + l.macho.text_data.len + l.macho.str_data.len
@@ -815,7 +815,6 @@ fn (mut l Linker) write_text_with_relocations() {
815815
}
816816
}
817817

818-
819818
// Apply relocations
820819
for r in l.macho.relocs {
821820
sym_addr := sym_addrs[r.sym_idx]
@@ -895,7 +894,8 @@ fn (mut l Linker) write_stubs() {
895894
}
896895

897896
fn read_u32_le(data []u8, off int) u32 {
898-
return u32(data[off]) | (u32(data[off + 1]) << 8) | (u32(data[off + 2]) << 16) | (u32(data[off + 3]) << 24)
897+
return u32(data[off]) | (u32(data[off + 1]) << 8) | (u32(data[off + 2]) << 16) | (u32(data[
898+
off + 3]) << 24)
899899
}
900900

901901
fn write_u32_le_at_arr(mut data []u8, off int, v u32) {

‎vlib/v2/ssa/builder.v‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,8 @@ fn (mut b Builder) expr_slice(base ast.Expr, range_expr ast.RangeExpr) ValueID {
748748
exit_blk := b.mod.add_block(b.cur_func, 'slice.exit')
749749

750750
// Allocate loop counter on stack
751-
counter_ptr := b.mod.add_instr(.alloca, b.cur_block, b.mod.type_store.get_ptr(i64_t), [])
751+
counter_ptr := b.mod.add_instr(.alloca, b.cur_block, b.mod.type_store.get_ptr(i64_t),
752+
[])
752753
zero := b.mod.add_value_node(.constant, i64_t, '0', 0)
753754
b.mod.add_instr(.store, b.cur_block, 0, [zero, counter_ptr])
754755

@@ -770,7 +771,10 @@ fn (mut b Builder) expr_slice(base ast.Expr, range_expr ast.RangeExpr) ValueID {
770771

771772
// Source: base[start + counter]
772773
src_idx := b.mod.add_instr(.add, b.cur_block, i64_t, [start_val, counter2])
773-
src_ptr := b.mod.add_instr(.get_element_ptr, b.cur_block, elem_ptr_t, [actual_base, src_idx])
774+
src_ptr := b.mod.add_instr(.get_element_ptr, b.cur_block, elem_ptr_t, [
775+
actual_base,
776+
src_idx,
777+
])
774778
elem_val := b.mod.add_instr(.load, b.cur_block, i64_t, [src_ptr])
775779

776780
// Dest: slice[counter]

0 commit comments

Comments
 (0)