v1.7 spec mostly implemented, mostly untested

[dcpu16] / dcpu16.h

diff --git a/dcpu16.h b/dcpu16.h
index c893347ea3485e9b6aecb7bd0893b12c1a111ccf..35c1fe878877ba8ce9cf00c8f4e55a54caf60633 100644 (file)
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -8,20 +8,32 @@ typedef unsigned short DCPU16_WORD;
 
 /* how much ram the system has */
 #define DCPU16_RAM 0x10000
+#define DCPU16_INTERRUPT_QUEUE_SIZE 256
 
 /* a self-contained dcpu16 core */
 struct dcpu16 {
     struct dcpu16_acct_cb *cb_table_;   /* list of callbacks to invoke for certain events */
     size_t cb_table_entries_;           /* callback list maintenance */
     size_t cb_table_allocated_;         /* callback list maintenance */
+
+    struct dcpu16_hw *hw_table_;        /* list of hardware attached to system */
+    size_t hw_table_entries_;           /* hardware list maintenance */
+    size_t hw_table_allocated_;         /* hardware list maintenance */
+
     unsigned int skip_ : 1;             /* skip execution of next instruction */
+    unsigned int interrupts_deferred_ : 1; /* queue software interrupts */
+    unsigned int on_fire_ : 1;          /* cpu is on fire */
     DCPU16_WORD reg_work_[2];           /* work registers for holding literal values while decoding instructions */
+    DCPU16_WORD interrupts_[DCPU16_INTERRUPT_QUEUE_SIZE];    /* fifo of pending interrupts */
+    size_t interrupts_head_;            /* interrupt queue maintenance */
+    size_t interrupts_tail_;            /* interrupt queue maintenance */
 
     unsigned long long cycle;           /* number of cycles this core has executed */
     DCPU16_WORD reg[8];                 /* system registers, a b c x y z i j */
     DCPU16_WORD pc;                     /* program counter */
     DCPU16_WORD sp;                     /* stack pointer */
-    DCPU16_WORD o;                      /* overflow */
+    DCPU16_WORD ex;                     /* overflow */
+    DCPU16_WORD ia;                     /* interrupt address */
     DCPU16_WORD ram[DCPU16_RAM];        /* memory */
 };
 
@@ -39,6 +51,18 @@ struct dcpu16_acct_cb {
     dcpu16_acct_event mask;
 };
 
+/* these are used to define hardware attached to the system */
+struct dcpu16_hw {
+    char *name_;
+    DCPU16_WORD id_l;
+    DCPU16_WORD id_h;
+    DCPU16_WORD ver;
+    DCPU16_WORD mfg_l;
+    DCPU16_WORD mfg_h;
+    void (*int_fn)(struct dcpu16 *, void *);
+    void *data;
+};
+
 /* instantiate a new core */
 struct dcpu16 *dcpu16_new(void);
 
@@ -51,11 +75,17 @@ void dcpu16_state_print(struct dcpu16 *);
 /* print the contents of ram from second to third argument */
 void dcpu16_dump_ram(struct dcpu16 *, DCPU16_WORD, DCPU16_WORD);
 
+/* print words in buf as asm */
+DCPU16_WORD dcpu16_mnemonify_buf(DCPU16_WORD *);
+
 /* print the instruction at the specified address, returns number of words consumed in decoding */
 DCPU16_WORD dcpu16_disassemble_print(struct dcpu16 *, DCPU16_WORD);
 
+/* register new 'hardware' device with system */
+int dcpu16_hw_add(struct dcpu16 *, struct dcpu16_hw *);
+
 /* register a callback for an accounting event */
-int dcpu16_acct_add(struct dcpu16 *, dcpu16_acct_event mask, dcpu16_ev_cb_t *fn, void *data);
+int dcpu16_acct_add(struct dcpu16 *, dcpu16_acct_event, dcpu16_ev_cb_t *, void *);
 
 /* execute the next instruction */
 void dcpu16_step(struct dcpu16 *);