Update for new emulator.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@557 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/emul/emul.cpp b/emul/emul.cpp
index b6cf30fa4e6d9773549186fe67054c1770e2adf6..9be4ed23071f03c35451683e581217897d507aff 100755 (executable)
--- a/emul/emul.cpp
+++ b/emul/emul.cpp
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/02/24 01:35:40  bernie
+ *#* Update for new emulator.
+ *#*
  *#* Revision 1.3  2006/02/20 02:00:40  bernie
  *#* Port to Qt 4.1.
  *#*
@@ -30,6 +33,12 @@
 #include "emulwin.h"
 #include <cfg/module.h>
 
+#include <appconfig.h>
+#if CONFIG_KERNEL
+       #include <config_kern.h>
+#endif
+
+
 #include <cstdlib> // std::exit()
 
 #if _QT < 4
@@ -42,6 +51,17 @@
 /// The global emulator instance.
 Emulator *emul;
 
+#if CONFIG_KERNEL
+       #include <mware/list.h>
+
+       /// List of process stacks
+       List StackFreeList;
+
+       // HACK: Reserve 64KB of stack space for kernel processes
+       const int NPROC = 8;
+       int stacks[NPROC][(64 * 1024) / sizeof(int)];
+#endif
+
 Emulator::Emulator(int &argc, char **argv) :
        emulApp(new QApplication(argc, argv)),
        emulWin(new EmulWin(this))
@@ -79,6 +99,12 @@ extern "C" void emul_init(int *argc, char *argv[])
        // setup global emulator pointer
        emul = new Emulator(*argc, argv);
 
+#if CONFIG_KERNEL
+       LIST_INIT(&StackFreeList);
+       for (int i = 0; i < NPROC; i++)
+               ADDTAIL(&StackFreeList, (Node *)stacks[i]);
+#endif
+
        MOD_INIT(emul);
 }
 

diff --git a/kern/switch_x86_64.s b/kern/switch_x86_64.s
index 339c66762d0fddad1fc0dbea627f356ef689a0c4..99fe9834c8131c96e05e9fda5be2f9035a342d93 100755 (executable)
--- a/kern/switch_x86_64.s
+++ b/kern/switch_x86_64.s
@@ -15,6 +15,9 @@
 
 /*
  * $Log$
+ * Revision 1.3  2006/02/24 01:35:40  bernie
+ * Update for new emulator.
+ *
  * Revision 1.2  2006/02/24 01:17:05  bernie
  * Update for new emulator.
  *
@@ -36,9 +39,9 @@
 #.intel_syntax
 
 /* void AsmSwitchContext(void **new_sp, void **save_sp) */
-/*                       %rdi           %rsi
-.globl AsmSwitchContext
-AsmSwitchContext:
+/*                       %rdi           %rsi            */
+.globl asm_switch_context
+asm_switch_context:
        pushq   %rax
        pushq   %rbx
        pushq   %rcx