summaryrefslogtreecommitdiff
path: root/kernel/asm.s
diff options
context:
space:
mode:
authorJake Mannens <jakem_5@hotmail.com>2020-03-18 14:01:12 +1100
committerJake Mannens <jakem_5@hotmail.com>2020-03-18 14:01:12 +1100
commit4d6fe1c317f0a541922f4cf945365fd31e608e10 (patch)
treeb78f721d50924094d4926ee90131a98ba12eb95e /kernel/asm.s
parenteda36531e8daedd045fb02c9c590cdf4dddd957f (diff)
Added decimal and octal conversion specifiers ('%d' and '%o') to
vsprintf(). Coverted all printk()/printf() functions to capatalised hex for readability. Tidied up some code.
Diffstat (limited to 'kernel/asm.s')
-rw-r--r--kernel/asm.s7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/asm.s b/kernel/asm.s
index 655dcfc..4e1e376 100644
--- a/kernel/asm.s
+++ b/kernel/asm.s
@@ -15,11 +15,7 @@ switch_to:
; abort if we're switching to the current task
mov ebx, [ctask]
cmp ebx, [ebp+12]
- jne .skip
- pop ebx
- pop ebp
- ret
-.skip:
+ je .end
; update ctask and ctaskn
mov ebx, [ebp+12]
mov [ctask], ebx
@@ -31,6 +27,7 @@ switch_to:
shl ebx, 3
mov [.tmp+4], bx
jmp far [.tmp]
+.end:
pop ebx
pop ebp
ret