add instr, manifest, dev_variant

inc/instr.h

@@ -0,0 +1,94 @@
+#ifndef __INSTR_H__
+#define __INSTR_H__
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "mem.h"
+
+
+#ifndef OPCODE_WORDSIZE
+    #error OPCODE_WORDSIZE must be provided
+//     #define OPCODE_WORDSIZE 1
+#endif
+#if OPCODE_WORDSIZE == 1
+    typedef uint8_t opcode_t;
+#elif OPCODE_WORDSIZE == 2
+    typedef uint16_t opcode_t;
+#elif OPCODE_WORDSIZE == 3
+    typedef uint32_t opcode_t;
+#elif OPCODE_WORDSIZE == 4
+    typedef uint32_t opcode_t;
+#else
+    #error OPCODE_WORDSIZE must be one of 1,2,3,4
+#endif
+
+
+#ifndef PC_WORDSIZE
+    #error PC_WORDSIZE must be provided
+//     #define PC_WORDSIZE 1
+#endif
+#if PC_WORDSIZE == 1
+    typedef uint8_t prog_counter_t;
+#elif PC_WORDSIZE == 2
+    typedef uint16_t prog_counter_t;
+#elif PC_WORDSIZE == 3
+    typedef uint32_t prog_counter_t;
+#elif PC_WORDSIZE == 4
+    typedef uint32_t prog_counter_t;
+#else
+    #error PC_WORDSIZE must be one of 1,2,3,4
+#endif
+
+typedef uint8_t (*instr_h_func)(prog_counter_t*, device_mem_t*);
+
+typedef struct 
+{
+    instr_h_func h;
+    opcode_t base;
+    opcode_t argsMask;
+    uint8_t opcodeLen;
+
+} instruction_metadata_t;
+
+instr_h_func* genInstrArray(char* errbuf);
+void setOpcodeSizes(uint8_t* opcodeSizes);
+opcode_t extractOpcode(device_mem_t* devMem, prog_counter_t programCounter);
+
+
+
+
+#define READ_MEM(__tgt, __mem, __segno, __addr, __cell_t) \
+{\
+    uint64_t __globalAddr = __mem->memsegShifts[__segno] + __addr; \
+    if (__mem->smartAddrReadHandlers[__globalAddr].func != NULL) \
+    { \
+        __tgt = *(__cell_t*)__mem->smartAddrReadHandlers[__globalAddr].func(__mem->smartAddrReadHandlers[__globalAddr].ident, __addr, __mem->rawCells + __mem->memsegShifts[__segno]); \
+    } \
+    else \
+    { \
+        __tgt = ((__cell_t*)__mem->cells[__segno])[__addr]; \
+    } \
+    __mem->memreadCellAddrs[__mem->memreadLen] = __globalAddr; \
+    __mem->memreadLen += 1; \
+}
+
+#define WRITE_MEM(__mem, __segno, __addr, __cell_t, __val) \
+{ \
+    uint64_t __globalAddr = __mem->memsegShifts[__segno] + __addr; \
+    if (__mem->smartAddrWriteHandlers[__globalAddr].func != NULL) \
+    { \
+        __cell_t __dat = (__cell_t)(__val); \
+        __mem->smartAddrWriteHandlers[__globalAddr].func(__mem->smartAddrWriteHandlers[__globalAddr].ident, __addr, __mem->rawCells + __mem->memsegShifts[__segno], (void*)&__dat); \
+    } \
+    else \
+    { \
+        ((__cell_t*)__mem->cells[__segno])[__addr] = (__cell_t)(__val); \
+    } \
+    __mem->memwriteCellAddrs[__mem->memwriteLen] = __globalAddr; \
+    __mem->memwriteLen += 1; \
+}
+
+
+
+#endif // ifndef __INSTR_H__

inc/instr_map.h

@@ -0,0 +1,13 @@
+#ifndef __INSTR_MAP_H__
+#define __INSTR_MAP_H__
+#include "instr.h"
+#include "mem.h"
+#include <stdio.h>
+#include "addrs.h"
+
+uint8_t _nop        (prog_counter_t* pcounter, device_mem_t* devMem);
+
+#define HANDLER_REGISTERS {\
+	{&_nop,        0b0000000000000000,	0b1111111111111111,	2}} 
+
+#endif

inc/mem_seg.h

@@ -1,23 +1,23 @@
 #ifndef __MEM_SEG_H__
 #define __MEM_SEG_H__
 
-<<<<<<< HEAD
-#ifndef DEVICE_TYPE
-#define DEVICE_TYPE EXTENDED_DEVICE_TYPE_DUMMY
-#endif
-=======
->>>>>>> 1f4cc4d (Initial commit)
+#include "../../../inc/libhmmmm.h"
 
-// #define MEMSEG_PC_SEG_NUM 0
-// #define MEMSEG_PC_ADDR 0
+#ifndef DEVICE_TYPE
+#define DEVICE_TYPE EXTENDED_DEVICE_TYPE_INSTR_SIMUL
+#endif
+
+
+#define MEMSEG_PS   0
+#define MEMDATA_PS MEMSEG_PS
+
+
+#define MEMSEG_PC_SEG_NUM 1
+#define MEMSEG_PC_ADDR 0
 
 #define MEMSEG_DEFINES {\
-	{0, "seg0", 1, 0, 0, 0}, \
-	{1, "seg1", 1, 0, 0, 0}, \
-	{2, "seg2", 1, 0, 0, 0}, \
-	{3, "seg3", 1, 0, 0, 0}, \
-	{4, "seg4", 1, 0, 0, 0}, \
-	{5, "seg5", 1, 0, 0, 0}, \
+	{MEMSEG_PS, "PS", 2, 1024, 0, 1}, \
+	{MEMSEG_PC_SEG_NUM, "PC", 2, 1, 1024 + MEMSEG_PC_ADDR + 1, 0} \
 }
 
 #endif //ifndef __MEM_SEG_H__