merge

lxc/execute

@@ -81,6 +81,9 @@ case "$lang" in
 "nasm" | "asm")
     bin=nasm
     ;;
+"nasm64" | "asm64")
+    bin=nasm64
+    ;;
 "node" | "js" | "javascript")
     bin=node
     ;;

lxc/executors/nasm

@@ -1,4 +1,4 @@
 cd /tmp/$2
-timeout -s KILL 10 nasm -f elf64 -o binary.o code.code
-timeout -s KILL 10 ld binary.o -o binary
+timeout -s KILL 10 nasm -f elf32 -o binary.o code.code
+timeout -s KILL 10 ld -m elf_i386 binary.o -o binary
 runuser runner$1 -c "cd /tmp/$2 ; cat args.args | xargs -d '\n' timeout -s KILL 3 ./binary"

lxc/executors/nasm64

@@ -0,0 +1,4 @@
+cd /tmp/$2
+timeout -s KILL 10 nasm -f elf64 -o binary.o code.code
+timeout -s KILL 10 ld -m elf_x86_64 binary.o -o binary
+runuser runner$1 -c "cd /tmp/$2 ; cat args.args | xargs -d '\n' timeout -s KILL 3 ./binary"

lxc/test_all_lxc

@@ -23,8 +23,10 @@ echo 'testing js'
 ../execute js test.js
 echo 'testing kotlin'
 ../execute kotlin test.kt
-echo 'testing asm'
+echo 'testing asm 32 bit'
 ../execute asm test.nasm
+echo 'testing asm 64 bit'
+../execute asm64 test64.nasm
 echo 'testing php'
 ../execute php test.php
 echo 'testing perl'

lxc/tests/test64.nasm

@@ -0,0 +1,18 @@
+SECTION .data
+	good:	db "good", 0x0a, 0x0
+	txtlen:	equ $ - good
+
+SECTION .text
+GLOBAL _start
+
+_start:
+	;sys_write
+	mov rax, 1
+	mov rdi, 1
+	mov rsi, good
+	mov rdx, txtlen
+	syscall
+	;sys_exit
+	mov rax, 60
+	mov rdi, 0
+	syscall