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

x64: fix NUL at end of strings, and length

pull/4853/head
JalonSolov 2020-05-11 10:50:36 -04:00 committed by GitHub
parent e638d12654
commit 649a0140fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/v/gen/x64/elf.v
View File

@ -90,7 +90,7 @@ pub fn (mut g Gen) generate_elf_footer() {
for i, s in g.strings { for i, s in g.strings {
g.write64_at(segment_start + g.buf.len, int(g.str_pos[i])) g.write64_at(segment_start + g.buf.len, int(g.str_pos[i]))
g.write_string(s) g.write_string(s)
g.write8(6) g.write8(0)
} }
// Now we know the file size, set it // Now we know the file size, set it
file_size := g.buf.len file_size := g.buf.len

4
vlib/v/gen/x64/gen.v
View File

@ -413,14 +413,14 @@ pub fn (mut g Gen) gen_print(s string) {
// //
// qq := s + '\n' // qq := s + '\n'
// //
g.strings << s // + '\n' g.strings << s
// g.string_addr[s] = str_pos // g.string_addr[s] = str_pos
g.mov(.eax, 1) g.mov(.eax, 1)
g.mov(.edi, 1) g.mov(.edi, 1)
str_pos := g.buf.len + 2 str_pos := g.buf.len + 2
g.str_pos << str_pos g.str_pos << str_pos
g.mov64(.rsi, 0) // segment_start + 0x9f) // str pos // PLACEHOLDER g.mov64(.rsi, 0) // segment_start + 0x9f) // str pos // PLACEHOLDER
g.mov(.edx, s.len + 1) // len g.mov(.edx, s.len) // len
g.syscall() g.syscall()
} }

4
vlib/v/gen/x64/tests/x64_test.v
View File

@ -50,10 +50,6 @@ fn test_x64() {
} }
expected = expected.trim_space().trim('\n').replace('\r\n', '\n') expected = expected.trim_space().trim('\n').replace('\r\n', '\n')
mut found := res.output.trim_space().trim('\n').replace('\r\n', '\n') mut found := res.output.trim_space().trim('\n').replace('\r\n', '\n')
// remove ACK char TODO fix this in x64
buf := [byte(0x06)]
ack := string(buf)
found = found.replace(ack, '')
found = found.trim_space() found = found.trim_space()
if expected != found { if expected != found {
println(term.red('FAIL')) println(term.red('FAIL'))