add instr, manifest, dev_variant

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__