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

cgen: support closures on arm32 as well (#12875)

pull/12885/head
spaceface 2021-12-17 13:26:24 +01:00 committed by GitHub
parent e5e3979e45
commit d80dd77adf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.cirrus.yml
View File

@ -19,7 +19,7 @@ arm64_task:
name: Code CI / arm64-ubuntu-tcc name: Code CI / arm64-ubuntu-tcc
arm_container: arm_container:
image: ubuntu:latest image: ubuntu:latest
install_script: apt-get update -y && apt-get install --quiet -y build-essential pkg-config wget git valgrind libsqlite3-dev libssl-dev libxi-dev libxcursor-dev libfreetype6-dev libxi-dev libxcursor-dev libgl-dev xfonts-75dpi xfonts-base libmysqlclient-dev libpq-dev install_script: apt-get update -y && apt-get install --quiet -y build-essential pkg-config wget git valgrind libsqlite3-dev libssl-dev libxi-dev libxcursor-dev libfreetype6-dev libxi-dev libxcursor-dev libgl-dev xfonts-75dpi xfonts-base libmysqlclient-dev libpq-dev gcc-10-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user
env: env:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
VFLAGS: -cc tcc -no-retry-compilation VFLAGS: -cc tcc -no-retry-compilation
@ -81,3 +81,8 @@ arm64_task:
./v run examples/v_script.vsh ./v run examples/v_script.vsh
# - name: Test v tutorials # - name: Test v tutorials
./v tutorials/building_a_simple_web_blog_with_vweb/code/blog ./v tutorials/building_a_simple_web_blog_with_vweb/code/blog
# test the arm32 version of tcc
# TODO: support something like `V_EMULATOR=qemu-arm v run file.v` so that V automatically runs all binaries under qemu
./v -arch arm32 -cc arm-linux-gnueabihf-gcc-10 -o av cmd/v && qemu-arm -L /usr/arm-linux-gnueabihf ./av -arch arm32 -cc arm-linux-gnueabihf-gcc-10 -o av2 cmd/v && qemu-arm -L /usr/arm-linux-gnueabihf ./av2 -arch arm32 -cc arm-linux-gnueabihf-gcc-10 -o av3 cmd/v && qemu-arm -L /usr/arm-linux-gnueabihf ./av3 -arch arm32 -cc arm-linux-gnueabihf-gcc-10 -o av4 cmd/v
./v -arch arm32 -o closure_test.c vlib/v/tests/closure_test.v && arm-linux-gnueabihf-gcc-10 -o closure_test closure_test.c && qemu-arm -L /usr/arm-linux-gnueabihf ./closure_test

45
vlib/v/gen/c/cheaders.v
View File

@ -58,15 +58,24 @@ static inline void __sort_ptr(uintptr_t a[], bool b[], int l) {
} }
' '
fn arm_bytes(nargs int) string { fn arm64_bytes(nargs int) string {
// start: // start:
// ldr x16, start-0x08 // ldr x16, start-0x08
// ldr x<REG>, start-0x10 // ldr x<REG>, start-0x10
// br x16 // br x16
bytes := '0xd0, 0xff, 0xff, 0x58, 0x6<REG>, 0xff, 0xff, 0x58, 0x00, 0x02, 0x1f, 0xd6' bytes := '0xd0, 0xff, 0xff, 0x58, 0x6<REG>, 0xff, 0xff, 0x58, 0x00, 0x02, 0x1f, 0xd6'
return bytes.replace('<REG>', nargs.str()) return bytes.replace('<REG>', nargs.str())
} }
fn arm32_bytes(nargs int) string {
// start:
// ldr r9, start-0x4
// ldr r<REG>, start-0x8
// bx r9
bytes := '0x0c, 0x90, 0x1f, 0xe5, 0x14, 0x<REG>0, 0x1f, 0xe5, 0x19, 0xff, 0x2f, 0xe1'
return bytes.replace('<REG>', nargs.str())
}
// Heavily based on Chris Wellons's work // Heavily based on Chris Wellons's work
// https://nullprogram.com/blog/2017/01/08/ // https://nullprogram.com/blog/2017/01/08/
@ -74,7 +83,7 @@ fn c_closure_helpers(pref &pref.Preferences) string {
if pref.os == .windows { if pref.os == .windows {
verror('closures are not implemented on Windows yet') verror('closures are not implemented on Windows yet')
} }
if pref.arch !in [.amd64, .arm64] { if pref.arch !in [.amd64, .arm64, .arm32] {
verror('closures are not implemented on this architecture yet: $pref.arch') verror('closures are not implemented on this architecture yet: $pref.arch')
} }
mut builder := strings.new_builder(2048) mut builder := strings.new_builder(2048)
@ -109,17 +118,35 @@ static unsigned char __closure_thunk[6][13] = {
builder.write_string(' builder.write_string('
static unsigned char __closure_thunk[6][12] = { static unsigned char __closure_thunk[6][12] = {
{ {
${arm_bytes(0)} ${arm64_bytes(0)}
}, { }, {
${arm_bytes(1)} ${arm64_bytes(1)}
}, { }, {
${arm_bytes(2)} ${arm64_bytes(2)}
}, { }, {
${arm_bytes(3)} ${arm64_bytes(3)}
}, { }, {
${arm_bytes(4)} ${arm64_bytes(4)}
}, { }, {
${arm_bytes(5)} ${arm64_bytes(5)}
},
};
')
} else if pref.arch == .arm32 {
builder.write_string('
static unsigned char __closure_thunk[6][12] = {
{
${arm32_bytes(0)}
}, {
${arm32_bytes(1)}
}, {
${arm32_bytes(2)}
}, {
${arm32_bytes(3)}
}, {
${arm32_bytes(4)}
}, {
${arm32_bytes(5)}
}, },
}; };
') ')