From 273655ecc8944a5a8907fadaf9fc37835252d2f0 Mon Sep 17 00:00:00 2001
From: Louis Schmieder <dev@louis-schmieder.de>
Date: Sun, 11 Apr 2021 22:32:28 +0200
Subject: [PATCH] vfmt: fix asm volatile & goto (#9688)

---
 vlib/builtin/linux_bare/linuxsys_bare.v | 14 +++++++-------
 vlib/v/fmt/fmt.v                        | 12 ++++++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/vlib/builtin/linux_bare/linuxsys_bare.v b/vlib/builtin/linux_bare/linuxsys_bare.v
index 10748113b0..ddec203ddf 100644
--- a/vlib/builtin/linux_bare/linuxsys_bare.v
+++ b/vlib/builtin/linux_bare/linuxsys_bare.v
@@ -228,7 +228,7 @@ pub enum Map_flags {
 fn sys_call0(scn u64) u64 {
 	res := u64(0)
 	asm amd64 {
-		syscall 
+		syscall
 		; =a (res)
 		; a (scn)
 	}
@@ -238,7 +238,7 @@ fn sys_call0(scn u64) u64 {
 fn sys_call1(scn u64, arg1 u64) u64 {
 	res := u64(0)
 	asm amd64 {
-		syscall 
+		syscall
 		; =a (res)
 		; a (scn)
 		  D (arg1)
@@ -249,7 +249,7 @@ fn sys_call1(scn u64, arg1 u64) u64 {
 fn sys_call2(scn u64, arg1 u64, arg2 u64) u64 {
 	res := u64(0)
 	asm amd64 {
-		syscall 
+		syscall
 		; =a (res)
 		; a (scn)
 		  D (arg1)
@@ -261,7 +261,7 @@ fn sys_call2(scn u64, arg1 u64, arg2 u64) u64 {
 fn sys_call3(scn u64, arg1 u64, arg2 u64, arg3 u64) u64 {
 	res := u64(0)
 	asm amd64 {
-		syscall 
+		syscall
 		; =a (res)
 		; a (scn)
 		  D (arg1)
@@ -275,7 +275,7 @@ fn sys_call4(scn u64, arg1 u64, arg2 u64, arg3 u64, arg4 u64) u64 {
 	res := u64(0)
 	asm amd64 {
 		mov r10, arg4
-		syscall 
+		syscall
 		; =a (res)
 		; a (scn)
 		  D (arg1)
@@ -292,7 +292,7 @@ fn sys_call5(scn u64, arg1 u64, arg2 u64, arg3 u64, arg4 u64, arg5 u64) u64 {
 	asm amd64 {
 		mov r10, arg4
 		mov r8, arg5
-		syscall 
+		syscall
 		; =a (res)
 		; a (scn)
 		  D (arg1)
@@ -312,7 +312,7 @@ fn sys_call6(scn u64, arg1 u64, arg2 u64, arg3 u64, arg4 u64, arg5 u64, arg6 u64
 		mov r10, arg4
 		mov r8, arg5
 		mov r9, arg6
-		syscall 
+		syscall
 		; =a (res)
 		; a (scn)
 		  D (arg1)
diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v
index a20ab69f7a..326a0cec6b 100644
--- a/vlib/v/fmt/fmt.v
+++ b/vlib/v/fmt/fmt.v
@@ -668,7 +668,13 @@ fn expr_is_single_line(expr ast.Expr) bool {
 //=== Specific Stmt methods ===//
 
 fn (mut f Fmt) asm_stmt(stmt ast.AsmStmt) {
-	f.writeln('asm $stmt.arch {')
+	f.write('asm ')
+	if stmt.is_volatile {
+		f.write('volatile ')
+	} else if stmt.is_goto {
+		f.write('goto ')
+	}
+	f.writeln('$stmt.arch {')
 	f.indent++
 	for template in stmt.templates {
 		if template.is_directive {
@@ -678,7 +684,9 @@ fn (mut f Fmt) asm_stmt(stmt ast.AsmStmt) {
 		if template.is_label {
 			f.write(':')
 		} else {
-			f.write(' ')
+			if template.args.len > 0 {
+				f.write(' ')
+			}
 		}
 		for i, arg in template.args {
 			f.asm_arg(arg)