summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2014-10-28 13:30:56 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2014-10-28 13:30:56 +0100
commit35de150f189ae7d5ec19f31eb32379e1ee389867 (patch)
tree0874d0d24b689af0a30c5c7e37cf6993453bc3a5
parent9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c (diff)
downloadMelon-master.tar.gz
Melon-master.zip
Correct stupid modification.HEADmaster
-rw-r--r--HDD.imgbin20643840 -> 20643840 bytes
-rw-r--r--Source/Kernel/TaskManager/V86/V86Thread.class.cpp2
2 files changed, 1 insertions, 1 deletions
diff --git a/HDD.img b/HDD.img
index 2aadf20..7b00753 100644
--- a/HDD.img
+++ b/HDD.img
Binary files differ
diff --git a/Source/Kernel/TaskManager/V86/V86Thread.class.cpp b/Source/Kernel/TaskManager/V86/V86Thread.class.cpp
index 63bc2d8..5002225 100644
--- a/Source/Kernel/TaskManager/V86/V86Thread.class.cpp
+++ b/Source/Kernel/TaskManager/V86/V86Thread.class.cpp
@@ -79,7 +79,7 @@ bool V86Thread::handleV86GPF(registers_t *regs) {
u16int *ivt = 0;
u16int *stack = (u16int*)FP_TO_LINEAR(regs->ss, (regs->useresp & 0xFFFF));
u32int *stack32 = (u32int*)stack;
- bool is_operand32 = false;
+ bool is_operand32 = false, is_address32 = false;
while (true) {
switch (ip[0]) {