vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

native: fix macho header for amd64 macOS 'Big Sur' (#10304)

pull/10323/head
pancake 2021-06-02 15:09:57 +02:00 committed by GitHub
parent 452a51c8fe
commit 4b2319fd67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vlib/v/gen/native/amd64.v
View File

@ -664,13 +664,11 @@ fn (mut g Gen) fn_decl(node ast.FnDecl) {
// println('end of main: gen exit') // println('end of main: gen exit')
zero := ast.IntegerLiteral{} zero := ast.IntegerLiteral{}
g.gen_exit(zero) g.gen_exit(zero)
// return return
}
if !is_main {
// g.leave()
g.add8(.rsp, 0x10)
g.pop(.rbp)
} }
// g.leave()
g.add8(.rsp, 0x10)
g.pop(.rbp)
g.ret() g.ret()
} }

14
vlib/v/gen/native/macho.v
View File

@ -11,14 +11,14 @@ const (
// //
macho_symcmd_size = 0x18 macho_symcmd_size = 0x18
macho_d_size = 0x50 macho_d_size = 0x50
lc_symtab = 0x2
lc_dysymtab = 0xb
mh_object = 1 mh_object = 1
mh_execute = 2 mh_execute = 2
lc_dysymtab = 0xb
lc_load_dylib = 0xc
lc_load_dylinker = 0xe
lc_main = 0x80000028 lc_main = 0x80000028
lc_segment_64 = 0x19 lc_segment_64 = 0x19
lc_load_dylinker = 0xe lc_symtab = 0x2
lc_load_dylib = 0xc
) )
struct Symbol { struct Symbol {
@ -95,7 +95,7 @@ fn (mut g Gen) macho_segment64_text() []int {
g.write32(native.lc_segment_64) // LC_SEGMENT_64 g.write32(native.lc_segment_64) // LC_SEGMENT_64
g.write32(152) // 152 g.write32(152) // 152
g.write_string_with_padding('__TEXT', 16) // section name g.write_string_with_padding('__TEXT', 16) // section name
g.write64(0x100001000) // vmaddr g.write64(0x100000000) // vmaddr
patch << g.buf.len patch << g.buf.len
g.write64(0x00001000) // + codesize) // vmsize g.write64(0x00001000) // + codesize) // vmsize
g.write64(0x00000000) // filesize g.write64(0x00000000) // filesize
@ -109,7 +109,7 @@ fn (mut g Gen) macho_segment64_text() []int {
g.write_string_with_padding('__text', 16) // section name g.write_string_with_padding('__text', 16) // section name
g.write_string_with_padding('__TEXT', 16) // segment name g.write_string_with_padding('__TEXT', 16) // segment name
g.write64(0x0000000100002000) // vmaddr g.write64(0x0000000100001000) // vmaddr
patch << g.buf.len patch << g.buf.len
g.write64(0) // vmsize g.write64(0) // vmsize
g.write32(4096) // offset g.write32(4096) // offset
@ -395,7 +395,7 @@ fn (mut g Gen) write_symbol(s Symbol) {
fn (mut g Gen) sym_string_table() int { fn (mut g Gen) sym_string_table() int {
begin := g.buf.len begin := g.buf.len
g.zeroes(1) g.zeroes(1)
at := i64(0x100001000) at := i64(0x100000000)
for i, s in g.strings { for i, s in g.strings {
g.write64_at(at + g.buf.len, int(g.str_pos[i])) g.write64_at(at + g.buf.len, int(g.str_pos[i]))
g.write_string(s) g.write_string(s)