git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel - Disable nested locks in x86, added workqueue to build
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
include
/
arch.h
diff --git
a/Kernel/arch/x86/include/arch.h
b/Kernel/arch/x86/include/arch.h
index
8d8a14a
..
9307ada
100644
(file)
--- a/
Kernel/arch/x86/include/arch.h
+++ b/
Kernel/arch/x86/include/arch.h
@@
-9,15
+9,15
@@
// - Base Defintions
#define KERNEL_BASE 0xC0000000
#define BITS 32
// - Base Defintions
#define KERNEL_BASE 0xC0000000
#define BITS 32
+#define PAGE_SIZE 0x1000
#define INVLPTR ((void*)-1)
// Allow nested spinlocks?
#define INVLPTR ((void*)-1)
// Allow nested spinlocks?
-#define STACKED_LOCKS 2 // 0: No, 1: Per-CPU, 2: Per-Thread
#define LOCK_DISABLE_INTS 1
// - Processor/Machine Specific Features
#define LOCK_DISABLE_INTS 1
// - Processor/Machine Specific Features
-#if ARCH !=
i386 && ARCH != i486 && ARCH != i586
+#if ARCH !=
x86 && ARCH != x86_smp
# error "Unknown architecture '" #ARCH "'"
#endif
# error "Unknown architecture '" #ARCH "'"
#endif
@@
-40,25
+40,27
@@
* \brief Short Spinlock structure
*/
struct sShortSpinlock {
* \brief Short Spinlock structure
*/
struct sShortSpinlock {
- #if STACKED_LOCKS == 2
- volatile void *Lock; //!< Lock value
- #else
volatile int Lock; //!< Lock value
volatile int Lock; //!< Lock value
- #endif
#if LOCK_DISABLE_INTS
int IF; //!< Interrupt state on call to SHORTLOCK
#endif
#if LOCK_DISABLE_INTS
int IF; //!< Interrupt state on call to SHORTLOCK
#endif
- #if STACKED_LOCKS
- int Depth;
- #endif
};
// === MACROS ===
/**
* \brief Halt the CPU (shorter version of yield)
*/
};
// === MACROS ===
/**
* \brief Halt the CPU (shorter version of yield)
*/
+#if 1
+#define HALT() do { \
+ Uint32 flags; \
+ __asm__ __volatile__ ("pushf;pop %0" : "=a"(flags)); \
+ if( !(flags & 0x200) ) Panic("HALT called with interrupts disabled"); \
+ __asm__ __volatile__ ("hlt"); \
+} while(0)
+#else
#define HALT() __asm__ __volatile__ ("hlt")
#define HALT() __asm__ __volatile__ ("hlt")
+#endif
/**
* \brief Fire a magic breakpoint (bochs)
*/
/**
* \brief Fire a magic breakpoint (bochs)
*/
@@
-78,7
+80,7
@@
typedef signed long long Sint64;
typedef Uint size_t;
typedef char BOOL;
typedef Uint size_t;
typedef char BOOL;
-typedef Uint
64
tPAddr;
+typedef Uint
32
tPAddr;
typedef Uint32 tVAddr;
typedef struct {
typedef Uint32 tVAddr;
typedef struct {
@@
-113,19
+115,10
@@
typedef struct {
Uint Resvd4[1]; // SS
} tSyscallRegs;
Uint Resvd4[1]; // SS
} tSyscallRegs;
-typedef struct {
- #if USE_PAE
- Uint PDPT[4];
- #else
- Uint CR3;
- #endif
-} tMemoryState;
-
-typedef struct {
- Uint EIP, ESP, EBP;
-} tTaskState;
-
// === FUNCTIONS ===
// === FUNCTIONS ===
+extern void Debug_PutCharDebug(char ch);
+extern void Debug_PutStringDebug(const char *String);
+
extern int IS_LOCKED(struct sShortSpinlock *Lock);
extern int CPU_HAS_LOCK(struct sShortSpinlock *Lock);
extern void SHORTLOCK(struct sShortSpinlock *Lock);
extern int IS_LOCKED(struct sShortSpinlock *Lock);
extern int CPU_HAS_LOCK(struct sShortSpinlock *Lock);
extern void SHORTLOCK(struct sShortSpinlock *Lock);
UCC
git Repository :: git.ucc.asn.au