From 205a3e715655340d9d7ecb08727b54d4f0bbb881 Mon Sep 17 00:00:00 2001
From: Pedro Falcato <pedro.falcato@gmail.com>
Date: Sun, 30 Oct 2016 12:03:47 +0000
Subject: [PATCH] Remove not_rsp and not_esp.

---
 kernel/include/sortix/kernel/registers.h | 2 --
 kernel/scheduler.cpp                     | 2 --
 kernel/x64/interrupt.S                   | 2 --
 kernel/x86/interrupt.S                   | 2 --
 4 files changed, 8 deletions(-)

diff --git a/kernel/include/sortix/kernel/registers.h b/kernel/include/sortix/kernel/registers.h
index a3a17d42..41fd8136 100644
--- a/kernel/include/sortix/kernel/registers.h
+++ b/kernel/include/sortix/kernel/registers.h
@@ -70,7 +70,6 @@ struct interrupt_context
 	uint32_t edi;
 	uint32_t esi;
 	uint32_t ebp;
-	uint32_t not_esp;
 	uint32_t ebx;
 	uint32_t edx;
 	uint32_t ecx;
@@ -134,7 +133,6 @@ struct interrupt_context
 	uint64_t rdi;
 	uint64_t rsi;
 	uint64_t rbp;
-	uint64_t not_rsp;
 	uint64_t rbx;
 	uint64_t rdx;
 	uint64_t rcx;
diff --git a/kernel/scheduler.cpp b/kernel/scheduler.cpp
index e46229c6..ae6a6bfe 100644
--- a/kernel/scheduler.cpp
+++ b/kernel/scheduler.cpp
@@ -197,7 +197,6 @@ static void FakeInterruptedContext(struct interrupt_context* intctx, int int_no)
 	intctx->edi = intctx->edi;
 	intctx->esi = intctx->esi;
 	intctx->ebp = intctx->signal_pending;
-	intctx->not_esp = intctx->not_esp;
 	intctx->ebx = (uintptr_t) fakectx;
 	intctx->edx = intctx->edx;
 	intctx->ecx = intctx->ecx;
@@ -225,7 +224,6 @@ static void FakeInterruptedContext(struct interrupt_context* intctx, int int_no)
 	intctx->rdi = (uintptr_t) fakectx;
 	intctx->rsi = intctx->rsi;
 	intctx->rbp = intctx->signal_pending;
-	intctx->not_rsp = intctx->not_rsp;
 	intctx->rbx = (uintptr_t) fakectx;
 	intctx->rdx = intctx->rdx;
 	intctx->rcx = intctx->rcx;
diff --git a/kernel/x64/interrupt.S b/kernel/x64/interrupt.S
index 5d6d6ed4..712b667a 100644
--- a/kernel/x64/interrupt.S
+++ b/kernel/x64/interrupt.S
@@ -353,7 +353,6 @@ interrupt_handler_prepare:
 	pushq %rcx
 	pushq %rdx
 	pushq %rbx
-	pushq %rsp
 	pushq %rbp
 	pushq %rsi
 	pushq %rdi
@@ -409,7 +408,6 @@ load_interrupted_registers:
 	popq %rdi
 	popq %rsi
 	popq %rbp
-	addq $8, %rsp # Don't pop %rsp, may not be defined.
 	popq %rbx
 	popq %rdx
 	popq %rcx
diff --git a/kernel/x86/interrupt.S b/kernel/x86/interrupt.S
index ad35f5ae..a159e8cc 100644
--- a/kernel/x86/interrupt.S
+++ b/kernel/x86/interrupt.S
@@ -350,7 +350,6 @@ fixup_relocate_stack_complete:
 	pushl %ecx
 	pushl %edx
 	pushl %ebx
-	pushl %esp
 	pushl %ebp
 	pushl %esi
 	pushl %edi
@@ -407,7 +406,6 @@ load_interrupted_registers:
 	popl %edi
 	popl %esi
 	popl %ebp
-	addl $4, %esp # Don't pop %esp, may not be defined.
 	popl %ebx
 	popl %edx
 	popl %ecx