further changes for v1.7: cpu fixes, support for 'hardware' devices, display to vnc

[dcpu16] / dcpu16.h

diff --git a/dcpu16.h b/dcpu16.h
index 35c1fe878877ba8ce9cf00c8f4e55a54caf60633..f2bf787b52a589525961ec69fd75cdf03bc1c565 100644 (file)
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -10,8 +10,28 @@ typedef unsigned short DCPU16_WORD;
 #define DCPU16_RAM 0x10000
 #define DCPU16_INTERRUPT_QUEUE_SIZE 256
 
+extern const char * const dcpu16_reg_names[];
+enum dcpu16_register_indexes {
+    DCPU16_REG_A = 0,
+    DCPU16_REG_B,
+    DCPU16_REG_C,
+    DCPU16_REG_X,
+    DCPU16_REG_Y,
+    DCPU16_REG_Z,
+    DCPU16_REG_I,
+    DCPU16_REG_J,
+    DCPU16_REG_PC,
+    DCPU16_REG_SP,
+    DCPU16_REG_EX,
+    DCPU16_REG_IA,
+    DCPU16_REG__NUM
+};
+
 /* a self-contained dcpu16 core */
 struct dcpu16 {
+    void (*warn_cb_)(char *fmt, ...);
+    void (*trace_cb_)(char *fmt, ...);
+
     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 */
@@ -29,11 +49,7 @@ struct dcpu16 {
     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 ex;                     /* overflow */
-    DCPU16_WORD ia;                     /* interrupt address */
+    DCPU16_WORD reg[DCPU16_REG__NUM];   /* system registers, a b c x y z i j */
     DCPU16_WORD ram[DCPU16_RAM];        /* memory */
 };
 
@@ -51,15 +67,21 @@ struct dcpu16_acct_cb {
     dcpu16_acct_event mask;
 };
 
+typedef void (dcpu16_hw_signal_t)(struct dcpu16 *, void *);
 /* these are used to define hardware attached to the system */
 struct dcpu16_hw {
+    struct dcpu16 *vm;  /* which system do I belong to */
     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 *);
+
+    dcpu16_hw_signal_t *hwi;
+    dcpu16_hw_signal_t *cycle;
+    dcpu16_hw_signal_t *reset;
     void *data;
 };
 
@@ -93,6 +115,8 @@ void dcpu16_step(struct dcpu16 *);
 /* release a core */
 void dcpu16_delete(struct dcpu16 **);
 
+int dcpu16_interrupt(struct dcpu16 *, DCPU16_WORD);
+
 /* register callbacks to handle warning and debug messages, default is writing to stderr, may be set to null */
 void dcpu16_warn_cb_set(void (*)(char *, ...));
 void dcpu16_trace_cb_set(void (*)(char *, ...));