aboutsummaryrefslogtreecommitdiff
path: root/pk/pk.h
diff options
context:
space:
mode:
authorAndrew Waterman <waterman@cs.berkeley.edu>2016-03-09 23:58:17 -0800
committerAndrew Waterman <waterman@cs.berkeley.edu>2016-03-09 23:58:17 -0800
commitb94c7a4b07f96f24ae7411780abf874416549f7b (patch)
treeb94ca015e49392f52e5abf1209ee184fcf874db4 /pk/pk.h
parentf5a96732cb81571a3ba6b081b8556187d564f678 (diff)
downloadpk-b94c7a4b07f96f24ae7411780abf874416549f7b.zip
pk-b94c7a4b07f96f24ae7411780abf874416549f7b.tar.gz
pk-b94c7a4b07f96f24ae7411780abf874416549f7b.tar.bz2
Refactor pk, bbl, machine into separate libraries
Yuck.
Diffstat (limited to 'pk/pk.h')
-rw-r--r--pk/pk.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/pk/pk.h b/pk/pk.h
index 280ad6a..c86d596 100644
--- a/pk/pk.h
+++ b/pk/pk.h
@@ -24,30 +24,18 @@ typedef struct
#define kassert(cond) do { if(!(cond)) kassert_fail(""#cond); } while(0)
void do_panic(const char* s, ...) __attribute__((noreturn));
void kassert_fail(const char* s) __attribute__((noreturn));
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define CLAMP(a, lo, hi) MIN(MAX(a, lo), hi)
#ifdef __cplusplus
extern "C" {
#endif
-extern int have_vm;
-
void printk(const char* s, ...);
void printm(const char* s, ...);
int vsnprintf(char* out, size_t n, const char* s, va_list vl);
int snprintf(char* out, size_t n, const char* s, ...);
-void init_tf(trapframe_t*, long pc, long sp);
void start_user(trapframe_t* tf) __attribute__((noreturn));
void dump_tf(trapframe_t*);
-void unhandled_trap(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*);
-
static inline int insn_len(long insn)
{
return (insn & 0x3) < 0x3 ? 2 : 4;
@@ -60,11 +48,6 @@ extern int uarch_counters_enabled;
extern long uarch_counters[NUM_COUNTERS];
extern char* uarch_counter_names[NUM_COUNTERS];
-static inline void wfi()
-{
- asm volatile ("wfi" ::: "memory");
-}
-
#ifdef __cplusplus
}
#endif