Merge pull request #19 from kevrocks67/master

Change ASM module to default to 32 bit and add 64 bit executor

api/main.go

@@ -78,6 +78,7 @@ func Execute(res http.ResponseWriter, req *http.Request) {
 		"julia", "jl",
 		"kotlin",
 		"nasm", "asm",
+		"nasm64", "asm64",
 		"node", "javascript", "js",
 		"perl", "pl",
 		"php",
@@ -151,6 +152,8 @@ func launch(request Inbound, res http.ResponseWriter) {
 		execlang = "elixir"
 	case "asm":
 		execlang = "nasm"
+	case "asm64":
+		execlang = "nasm64"
 	case "js", "javascript":
 		execlang = "node"
 	case "jl":

lxc/execute

@@ -78,6 +78,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/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'