diff options
| author | Andrew Waterman <waterman@s144.Millennium.Berkeley.EDU> | 2011-04-12 01:42:20 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@s144.Millennium.Berkeley.EDU> | 2011-04-12 01:42:20 -0700 |
| commit | 27afdf1a005c2e24af79107095aae3155e68b254 (patch) | |
| tree | a5140912c1a50b8b9d4f6528244db3699c114446 /pk/pk.h | |
| parent | 7e6145731f4d52e9b6a6383c650c8de68da7aa34 (diff) | |
| download | pk-27afdf1a005c2e24af79107095aae3155e68b254.zip pk-27afdf1a005c2e24af79107095aae3155e68b254.tar.gz pk-27afdf1a005c2e24af79107095aae3155e68b254.tar.bz2 | |
[sim,pk] fixed minor pk bugs and trap codes
Diffstat (limited to 'pk/pk.h')
| -rw-r--r-- | pk/pk.h | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -1,6 +1,12 @@ #ifndef _PK_H #define _PK_H +#define USER_MEM_SIZE 0x70000000 +#define USER_MAINVARS_SIZE 0x1000 +#define USER_START 0x10000 + +#ifndef __ASSEMBLER__ + #include <stdint.h> typedef struct @@ -13,10 +19,6 @@ typedef struct long insn; } trapframe_t; -#define USER_MEM_SIZE 0x70000000 -#define USER_MAINVARS_SIZE 0x1000 -#define USER_START 0x10000 - #define panic(s,...) do { printk(s"\n", ##__VA_ARGS__); sys_exit(-1); } while(0) #define kassert(cond) do { if(!(cond)) panic("assertion failed: "#cond); } while(0) @@ -36,7 +38,8 @@ void dump_tf(trapframe_t*); void unhandled_trap(trapframe_t*); void handle_syscall(trapframe_t*); -void handle_misaligned_ldst(trapframe_t*); +void handle_misaligned_load(trapframe_t*); +void handle_misaligned_store(trapframe_t*); void handle_fault_load(trapframe_t*); void handle_fault_store(trapframe_t*); void boot(); @@ -55,3 +58,5 @@ static inline void advance_pc(trapframe_t* tf) #endif #endif + +#endif |