Simplify the remote connect assembly a bit

Author: fwsGonzo

lib/tinykvm/amd64/builtin/interrupts.asm

@@ -287,21 +287,19 @@ ALIGN 0x10
 	mov rdx, rax
 	shr rdx, 32
 	wrmsr
-	pop rdx
-	pop rcx
 
 	;; Make the next function call return to a custom system call location
-	push rbx
 	;; Get remote-disconnect syscall address
 	mov rax, [INTR_ASM_BASE + .vm64_remote_return_addr]
 	;; Get original stack pointer
-	mov rbx, [rsp + 16 + 32] ;; Original RSP
+	mov rcx, [rsp + 24 + 32] ;; Original RSP
 	;; Overwrite the return address
 	stac
-	mov [rbx], rax ;; Return address
+	mov [rcx], rax ;; Return address
 	clac
 
-	pop rbx
+	pop rdx
+	pop rcx
 	pop rax
 	add rsp, 8 ;; Skip error code
 

lib/tinykvm/amd64/builtin/kernel_assembly.h

@@ -1,5 +1,5 @@
 unsigned char interrupts[] = {
-  0x50, 0x01, 0xc2, 0x02, 0x50, 0x03, 0x08, 0x00, 0xca, 0x02, 0x00, 0x00,
+  0x50, 0x01, 0xc2, 0x02, 0x48, 0x03, 0x08, 0x00, 0xca, 0x02, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -66,24 +66,23 @@ unsigned char interrupts[] = {
   0x57, 0x0f, 0x20, 0xd7, 0xe7, 0x8e, 0x0f, 0x01, 0x3f, 0x5f, 0x85, 0xc0,
   0x75, 0x07, 0x58, 0x48, 0x83, 0xc4, 0x08, 0x48, 0xcf, 0x51, 0x52, 0xb9,
   0x00, 0x01, 0x00, 0xc0, 0x48, 0x89, 0xc2, 0x48, 0xc1, 0xea, 0x20, 0x0f,
-  0x30, 0x5a, 0x59, 0x53, 0x48, 0x8b, 0x04, 0x25, 0x0a, 0x20, 0x00, 0x00,
-  0x48, 0x8b, 0x5c, 0x24, 0x30, 0x0f, 0x01, 0xcb, 0x48, 0x89, 0x03, 0x0f,
-  0x01, 0xca, 0x5b, 0x58, 0x48, 0x83, 0xc4, 0x08, 0x48, 0xcf, 0xe7, 0xa1,
-  0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x80, 0x48, 0xcf,
-  0x90, 0x90, 0x90, 0x90, 0xe7, 0x81, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90,
-  0xe7, 0x82, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x83, 0x48, 0xcf,
-  0x90, 0x90, 0x90, 0x90, 0xe7, 0x84, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90,
-  0xe7, 0x85, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x86, 0x48, 0xcf,
-  0x90, 0x90, 0x90, 0x90, 0xe7, 0x87, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90,
-  0xe7, 0x88, 0xe9, 0x78, 0xff, 0xff, 0xff, 0x90, 0xe7, 0x89, 0x48, 0xcf,
-  0x90, 0x90, 0x90, 0x90, 0xe7, 0x8a, 0xe9, 0x68, 0xff, 0xff, 0xff, 0x90,
-  0xe7, 0x8b, 0xe9, 0x60, 0xff, 0xff, 0xff, 0x90, 0xe7, 0x8c, 0xe9, 0x58,
-  0xff, 0xff, 0xff, 0x90, 0xe7, 0x8d, 0xe9, 0x50, 0xff, 0xff, 0xff, 0x90,
-  0xe9, 0x3a, 0xff, 0xff, 0xff, 0x90, 0x90, 0x90, 0xe7, 0x8f, 0x48, 0xcf,
-  0x90, 0x90, 0x90, 0x90, 0xe7, 0x90, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90,
-  0xe7, 0x91, 0xe9, 0x30, 0xff, 0xff, 0xff, 0x90, 0xe7, 0x92, 0x48, 0xcf,
-  0x90, 0x90, 0x90, 0x90, 0xe7, 0x93, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90,
-  0xe7, 0x94, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe9, 0x49, 0xff, 0xff,
-  0xff
+  0x30, 0x48, 0x8b, 0x04, 0x25, 0x0a, 0x20, 0x00, 0x00, 0x48, 0x8b, 0x4c,
+  0x24, 0x38, 0x0f, 0x01, 0xcb, 0x48, 0x89, 0x01, 0x0f, 0x01, 0xca, 0x5a,
+  0x59, 0x58, 0x48, 0x83, 0xc4, 0x08, 0x48, 0xcf, 0xe7, 0xa1, 0x48, 0xcf,
+  0xe7, 0x80, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x81, 0x48, 0xcf,
+  0x90, 0x90, 0x90, 0x90, 0xe7, 0x82, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90,
+  0xe7, 0x83, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x84, 0x48, 0xcf,
+  0x90, 0x90, 0x90, 0x90, 0xe7, 0x85, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90,
+  0xe7, 0x86, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x87, 0x48, 0xcf,
+  0x90, 0x90, 0x90, 0x90, 0xe7, 0x88, 0xeb, 0x83, 0x90, 0x90, 0x90, 0x90,
+  0xe7, 0x89, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x8a, 0xe9, 0x70,
+  0xff, 0xff, 0xff, 0x90, 0xe7, 0x8b, 0xe9, 0x68, 0xff, 0xff, 0xff, 0x90,
+  0xe7, 0x8c, 0xe9, 0x60, 0xff, 0xff, 0xff, 0x90, 0xe7, 0x8d, 0xe9, 0x58,
+  0xff, 0xff, 0xff, 0x90, 0xe9, 0x42, 0xff, 0xff, 0xff, 0x90, 0x90, 0x90,
+  0xe7, 0x8f, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x90, 0x48, 0xcf,
+  0x90, 0x90, 0x90, 0x90, 0xe7, 0x91, 0xe9, 0x38, 0xff, 0xff, 0xff, 0x90,
+  0xe7, 0x92, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90, 0xe7, 0x93, 0x48, 0xcf,
+  0x90, 0x90, 0x90, 0x90, 0xe7, 0x94, 0x48, 0xcf, 0x90, 0x90, 0x90, 0x90,
+  0xe9, 0x4f, 0xff, 0xff, 0xff
 };
-unsigned int interrupts_len = 1021;
+unsigned int interrupts_len = 1013;