From f76374000eb3fba5b24289c6fa72bee68eb410d4 Mon Sep 17 00:00:00 2001 From: WangRunji Date: Thu, 28 Feb 2019 00:12:59 +0800 Subject: [PATCH] fix x86_64 syscall register (r10) --- kernel/src/arch/x86_64/interrupt/handler.rs | 2 +- user | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/src/arch/x86_64/interrupt/handler.rs b/kernel/src/arch/x86_64/interrupt/handler.rs index 44b64b8..22406e4 100644 --- a/kernel/src/arch/x86_64/interrupt/handler.rs +++ b/kernel/src/arch/x86_64/interrupt/handler.rs @@ -163,7 +163,7 @@ fn to_kernel(tf: &mut TrapFrame) { fn syscall(tf: &mut TrapFrame) { trace!("\nInterupt: Syscall {:#x?}", tf.rax); - let ret = crate::syscall::syscall(tf.rax, [tf.rdi, tf.rsi, tf.rdx, tf.rcx, tf.r8, tf.r9], tf); + let ret = crate::syscall::syscall(tf.rax, [tf.rdi, tf.rsi, tf.rdx, tf.r10, tf.r8, tf.r9], tf); tf.rax = ret as usize; } diff --git a/user b/user index cb1bd5b..64dac11 160000 --- a/user +++ b/user @@ -1 +1 @@ -Subproject commit cb1bd5b835965f6a8502d336592aafe06496bdc1 +Subproject commit 64dac11ac304eece980ba4cffb2eac2040aa08b3