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/arm7 - Fiddling, still having issues with VMM
[tpg/acess2.git]
/
Kernel
/
arch
/
x86_64
/
include
/
arch.h
diff --git
a/Kernel/arch/x86_64/include/arch.h
b/Kernel/arch/x86_64/include/arch.h
index
0e5cb61
..
c2c622e
100644
(file)
--- a/
Kernel/arch/x86_64/include/arch.h
+++ b/
Kernel/arch/x86_64/include/arch.h
@@
-10,8
+10,10
@@
#define KERNEL_BASE 0xFFFFFFFF##80000000
#define BITS 64
#define KERNEL_BASE 0xFFFFFFFF##80000000
#define BITS 64
-#define STACKED_LOCKS 0
-#define LOCK_DISABLE_INTS 1
+#define STACKED_LOCKS 2 // 0: No, 1: Per-CPU, 2: Per-Thread
+#define LOCK_DISABLE_INTS 0
+
+#define INVLPTR ((void*)0x0FFFFFFFFFFFFFFFULL)
//#define INT_MAX 0x7FFFFFFF
//#define UINT_MAX 0xFFFFFFFF
//#define INT_MAX 0x7FFFFFFF
//#define UINT_MAX 0xFFFFFFFF
@@
-45,7
+47,7
@@
typedef char BOOL;
/**
* \brief Halt the CPU
*/
/**
* \brief Halt the CPU
*/
-#define HALT() __asm__ __volatile__ ("hlt")
+#define HALT() __asm__ __volatile__ ("
sti;\n\t
hlt")
/**
* \brief Fire a magic breakpoint (bochs)
*/
/**
* \brief Fire a magic breakpoint (bochs)
*/
@@
-99,5
+101,8
@@
extern int CPU_HAS_LOCK(struct sShortSpinlock *Lock);
extern void SHORTLOCK(struct sShortSpinlock *Lock);
extern void SHORTREL(struct sShortSpinlock *Lock);
extern void SHORTLOCK(struct sShortSpinlock *Lock);
extern void SHORTREL(struct sShortSpinlock *Lock);
+extern void Debug_PutCharDebug(char ch);
+extern void Debug_PutStringDebug(const char *Str);
+
#endif
#endif
UCC
git Repository :: git.ucc.asn.au