--- np2/win9x/Makefile	2003/10/21 11:22:05	1.1
+++ np2/win9x/Makefile	2004/01/05 06:05:11	1.14
@@ -25,23 +25,27 @@ VRAM		= ../vram
 FDD			= ../fdd
 LIO			= ../lio
 FONT		= ../font
+GENERIC		= ../generic
 TARGET		= .
+X86ASM		= ./x86
 DIALOG		= ./dialog
-KEYDISP		= ./keydisp
 DEBUGUTY	= ./debuguty
 
 HEADERS		=	$(TARGET)/compiler.h $(BASE)/common.h $(COMMON)/milstr.h \
 				$(COMMON)/_memory.h $(COMMON)/rect.h $(COMMON)/lstarray.h \
 				$(TARGET)/trace.h
 
+CPUCORES	=	$(I286C)/cpucore.h $(I286C)/memory.h
+
 PCCORES		=	$(BASE)/pccore.h $(BASE)/nevent.h
 
 IOCORES		=	$(IO)/iocore.h $(IO)/artic.h $(IO)/cgrom.h $(IO)/cpuio.h \
 				$(IO)/crtc.h $(IO)/dipsw.h $(IO)/dmac.h $(IO)/egc.h \
-				$(IO)/extmem.h $(IO)/fdc.h $(IO)/fdd320.h $(IO)/gdc.h \
-				$(IO)/gdc_cmd.h $(IO)/gdc_sub.h $(IO)/itf.h $(IO)/mouseif.h \
-				$(IO)/nmiio.h $(IO)/np2sysp.h $(IO)/pic.h $(IO)/pit.h \
-				$(IO)/printif.h $(IO)/serial.h $(IO)/sysport.h $(IO)/upd4990.h
+				$(IO)/epsonio.h $(IO)/extmem.h $(IO)/fdc.h $(IO)/fdd320.h \
+				$(IO)/gdc.h $(IO)/gdc_cmd.h $(IO)/gdc_sub.h $(IO)/mouseif.h \
+				$(IO)/necio.h $(IO)/nmiio.h $(IO)/np2sysp.h $(IO)/pic.h \
+				$(IO)/pit.h $(IO)/printif.h $(IO)/serial.h $(IO)/sysport.h \
+				$(IO)/upd4990.h
 
 FMBOARDS	=	$(SOUND)/soundrom.h $(SOUND)/tms3631.h $(SOUND)/fmtimer.h \
 				$(SOUND)/opngen.h $(SOUND)/psggen.h $(SOUND)/rhythm.h \
@@ -52,29 +56,32 @@ VERMOUTHS	=	$(VERMOUTH)/midiout.h $(VERM
 				$(VERMOUTH)/midtable.h
 
 AOPT	= -f win32
-COPT	= -c -Wall -pipe -O2 -fomit-frame-pointer -mno-cygwin \
-			-march=pentium -DWIN32 -DNDEBUG -D_WINDOWS \
+COPT	= -c -Wall -pipe -O6 -fomit-frame-pointer -fkeep-inline-functions \
+			-fsigned-char -mno-cygwin -march=pentium \
+			-DWIN32 -DNDEBUG -D_WINDOWS \
 			-I$(BASE) -I$(COMMON) -I$(I286C) -I$(IO) -I$(CBUS) -I$(BIOS) \
 			-I$(SOUND) -I$(VERMOUTH) -I$(VRAM) -I$(FDD) -I$(LIO) -I$(FONT) \
-			-I$(TARGET) -I$(DIALOG) -I$(KEYDISP) -I$(DEBUGUTY)
+			-I$(GENERIC) -I$(TARGET) -I$(DIALOG) -I$(DEBUGUTY) -I$(X86ASM)
 LOPT	= -mno-cygwin -lstdc++
 
 NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.o		$(OBJ)/_memory.o	\
 			$(OBJ)/textfile.o	$(OBJ)/profile.o	$(OBJ)/rect.o		\
 			$(OBJ)/lstarray.o	$(OBJ)/bmpdata.o	$(OBJ)/mimpidef.o	\
-			$(OBJ)/parts.o												\
+			$(OBJ)/parts.oa												\
 			$(OBJ)/i286c.o		$(OBJ)/i286c_mn.o	$(OBJ)/i286c_ea.o	\
 			$(OBJ)/i286c_0f.o	$(OBJ)/i286c_8x.o	$(OBJ)/i286c_sf.o	\
 			$(OBJ)/i286c_f6.o	$(OBJ)/i286c_fe.o	$(OBJ)/i286c_rp.o	\
-			$(OBJ)/memory.o		$(OBJ)/egcmem.o		$(OBJ)/dmap.o		\
+			$(OBJ)/v30patch.o	$(OBJ)/memory.o		$(OBJ)/egcmem.o		\
+			$(OBJ)/dmap.o												\
 			$(OBJ)/iocore.o		$(OBJ)/artic.o		$(OBJ)/cgrom.o		\
 			$(OBJ)/cpuio.o		$(OBJ)/crtc.o		$(OBJ)/dipsw.o		\
-			$(OBJ)/dmac.o		$(OBJ)/egc.o		$(OBJ)/extmem.o		\
-			$(OBJ)/fdc.o		$(OBJ)/fdd320.o		$(OBJ)/gdc.o		\
-			$(OBJ)/gdc_sub.o	$(OBJ)/gdc_pset.o	$(OBJ)/itf.o		\
-			$(OBJ)/mouseif.o	$(OBJ)/nmiio.o		$(OBJ)/np2sysp.o	\
-			$(OBJ)/pic.o		$(OBJ)/pit.o		$(OBJ)/printif.o	\
-			$(OBJ)/serial.o		$(OBJ)/sysport.o	$(OBJ)/upd4990.o	\
+			$(OBJ)/dmac.o		$(OBJ)/egc.o		$(OBJ)/epsonio.o	\
+			$(OBJ)/extmem.o		$(OBJ)/fdc.o		$(OBJ)/fdd320.o		\
+			$(OBJ)/gdc.o		$(OBJ)/gdc_sub.o	$(OBJ)/gdc_pset.o	\
+			$(OBJ)/mouseif.o	$(OBJ)/necio.o		$(OBJ)/nmiio.o		\
+			$(OBJ)/np2sysp.o	$(OBJ)/pic.o		$(OBJ)/pit.o		\
+			$(OBJ)/printif.o	$(OBJ)/serial.o		$(OBJ)/sysport.o	\
+			$(OBJ)/upd4990.o											\
 			$(OBJ)/cbuscore.o	$(OBJ)/pc9861k.o	$(OBJ)/mpu98ii.o	\
 			$(OBJ)/board14.o	$(OBJ)/board26k.o	$(OBJ)/board86.o	\
 			$(OBJ)/boardx2.o	$(OBJ)/board118.o	$(OBJ)/boardspb.o	\
@@ -88,14 +95,14 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(OBJ)/sound.o		$(OBJ)/sndcsec.o	$(OBJ)/fmboard.o	\
 			$(OBJ)/fmtimer.o	$(OBJ)/beepc.o		$(OBJ)/beepg.o		\
 			$(OBJ)/tms3631c.o	$(OBJ)/tms3631g.o	$(OBJ)/opngenc.o	\
-			$(OBJ)/opngeng.o	$(OBJ)/psggenc.o	$(OBJ)/psggeng.o	\
+			$(OBJ)/opngeng.oa	$(OBJ)/psggenc.o	$(OBJ)/psggeng.o	\
 			$(OBJ)/rhythmc.o	$(OBJ)/rhythmg.o	$(OBJ)/adpcmc.o		\
 			$(OBJ)/adpcmg.o		$(OBJ)/pcm86c.o		$(OBJ)/pcm86g.o		\
 			$(OBJ)/cs4231c.o	$(OBJ)/cs4231g.o	$(OBJ)/soundrom.o	\
 			$(OBJ)/s98.o												\
 			$(OBJ)/vram.o		$(OBJ)/scrndraw.o	$(OBJ)/sdraw.o		\
 			$(OBJ)/dispsync.o	$(OBJ)/palettes.o	$(OBJ)/maketext.o	\
-			$(OBJ)/maketgrp.o	$(OBJ)/makegrph.o	$(OBJ)/scrnbmp.o	\
+			$(OBJ)/maketgrp.o	$(OBJ)/makegrph.oa	$(OBJ)/scrnbmp.o	\
 			$(OBJ)/diskdrv.o	$(OBJ)/newdisk.o	$(OBJ)/fddfile.o	\
 			$(OBJ)/fdd_xdf.o	$(OBJ)/fdd_d88.o	$(OBJ)/fdd_mtr.o	\
 			$(OBJ)/sxsi.o												\
@@ -105,22 +112,23 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(OBJ)/font.o		$(OBJ)/fontdata.o	$(OBJ)/fontpc88.o	\
 			$(OBJ)/fontpc98.o	$(OBJ)/fontv98.o	$(OBJ)/fontfm7.o	\
 			$(OBJ)/fontx1.o		$(OBJ)/fontx68k.o	$(OBJ)/fontmake.o	\
-			$(OBJ)/np2.o		$(OBJ)/np2arg.o		$(OBJ)/dosio.o		\
-			$(OBJ)/extromio.o	$(OBJ)/trace.o		$(OBJ)/winloc.o		\
-			$(OBJ)/commng.o		$(OBJ)/cmserial.o	$(OBJ)/cmmidi.o		\
-			$(OBJ)/cmpara.o		$(OBJ)/fontmng.o	$(OBJ)/joymng.o		\
-			$(OBJ)/mousemng.o	$(OBJ)/scrnmng.o	$(OBJ)/soundmng.o	\
-			$(OBJ)/sysmng.o		$(OBJ)/taskmng.o	$(OBJ)/timemng.o	\
-			$(OBJ)/juliet.o		$(OBJ)/sstp.o		$(OBJ)/sstpmsg.o	\
-			$(OBJ)/winkbd.o		$(OBJ)/dclock.o		$(OBJ)/dclockd.o	\
-			$(OBJ)/menu.o		$(OBJ)/ini.o		$(OBJ)/np2info.o	\
-			$(OBJ)/np2res.o												\
-			$(OBJ)/d_about.o	$(OBJ)/d_config.o	$(OBJ)/d_mpu98.o	\
-			$(OBJ)/d_screen.o	$(OBJ)/d_serial.o	$(OBJ)/d_sound.o	\
-			$(OBJ)/d_clnd.o		$(OBJ)/d_disk.o		$(OBJ)/d_bmp.o		\
-			$(OBJ)/dialogs.o	$(OBJ)/bit2res.o						\
-			$(OBJ)/keydisp.o	$(OBJ)/keydisps.o	$(OBJ)/keydispr.o	\
-			$(OBJ)/dd2.o		$(OBJ)/dd2sub.o							\
+			$(OBJ)/cmndraw.o	$(OBJ)/keydisp.o	$(OBJ)/dipswbmp.o	\
+			$(OBJ)/cmjasts.o											\
+			$(OBJ)/np2.o		$(OBJ)/np2arg.o		$(OBJ)/cputype.oa	\
+			$(OBJ)/dosio.o		$(OBJ)/extromio.o	$(OBJ)/trace.o		\
+			$(OBJ)/winloc.o		$(OBJ)/commng.o		$(OBJ)/cmserial.o	\
+			$(OBJ)/cmmidi.o		$(OBJ)/cmpara.o		$(OBJ)/fontmng.o	\
+			$(OBJ)/joymng.o		$(OBJ)/mousemng.o	$(OBJ)/scrnmng.o	\
+			$(OBJ)/soundmng.o	$(OBJ)/sysmng.o		$(OBJ)/taskmng.o	\
+			$(OBJ)/timemng.o	$(OBJ)/juliet.o		$(OBJ)/sstp.o		\
+			$(OBJ)/sstpmsg.o	$(OBJ)/winkbd.o		$(OBJ)/dclock.o		\
+			$(OBJ)/dclockd.o	$(OBJ)/menu.o		$(OBJ)/ini.o		\
+			$(OBJ)/np2info.o	$(OBJ)/toolwin.o	$(OBJ)/dd2.o		\
+			$(OBJ)/kdispwin.o	$(OBJ)/np2res.o							\
+			$(OBJ)/np2class.o	$(OBJ)/d_about.o	$(OBJ)/d_config.o	\
+			$(OBJ)/d_mpu98.o	$(OBJ)/d_screen.o	$(OBJ)/d_serial.o	\
+			$(OBJ)/d_sound.o	$(OBJ)/d_clnd.o		$(OBJ)/d_disk.o		\
+			$(OBJ)/d_bmp.o		$(OBJ)/dialogs.o						\
 			$(OBJ)/viewer.o		$(OBJ)/viewcmn.o	$(OBJ)/viewmenu.o	\
 			$(OBJ)/viewmem.o	$(OBJ)/viewreg.o	$(OBJ)/viewseg.o	\
 			$(OBJ)/view1mb.o	$(OBJ)/viewasm.o	$(OBJ)/viewsnd.o	\
@@ -190,51 +198,61 @@ $(OBJ)/codecnv.o	:	$(COMMON)/codecnv.c $
 $(OBJ)/parts.o		:	$(COMMON)/parts.c $(HEADERS) $(COMMON)/codecnv.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/parts.oa		:	$(X86ASM)/parts.x86
+	$(AS) $(AOPT) $< -o $@
+
 
 
 $(OBJ)/i286c.o		:	$(I286C)/i286c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/i286c.h $(I286C)/memory.h \
+						$(I286C)/cpucore.h $(I286C)/i286c.h \
+						$(I286C)/v30patch.h $(I286C)/memory.h \
 						$(I286C)/dmap.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/i286c_mn.o	:	$(I286C)/i286c_mn.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/i286c.h $(I286C)/memory.h \
-						$(BIOS)/bios.h $(I286C)/i286c.mcr
+						$(I286C)/cpucore.h $(I286C)/i286c.h \
+						$(I286C)/memory.h $(BIOS)/bios.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/i286c_ea.o	:	$(I286C)/i286c_ea.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/i286c_ea.o	:	$(I286C)/i286c_ea.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/i286c.h $(I286C)/memory.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/i286c_0f.o	:	$(I286C)/i286c_0f.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/i286c_0f.o	:	$(I286C)/i286c_0f.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/i286c.h $(I286C)/memory.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/i286c_8x.o	:	$(I286C)/i286c_8x.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/i286c_8x.o	:	$(I286C)/i286c_8x.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/i286c.h $(I286C)/memory.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/i286c_sf.o	:	$(I286C)/i286c_sf.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/i286c_sf.o	:	$(I286C)/i286c_sf.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/i286c.h $(I286C)/memory.h \
 						$(I286C)/i286c.mcr $(I286C)/i286c_sf.mcr
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/i286c_f6.o	:	$(I286C)/i286c_f6.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/i286c_f6.o	:	$(I286C)/i286c_f6.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/i286c.h $(I286C)/memory.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/i286c_fe.o	:	$(I286C)/i286c_fe.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/i286c_fe.o	:	$(I286C)/i286c_fe.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/i286c.h $(I286C)/memory.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/i286c_rp.o	:	$(I286C)/i286c_rp.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/i286c.h $(I286C)/memory.h \
-						$(I286C)/i286c.mcr
+						$(I286C)/cpucore.h $(I286C)/i286c.h \
+						$(I286C)/memory.h $(I286C)/i286c.mcr
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/v30patch.o	:	$(I286C)/v30patch.c $(HEADERS) $(PCCORES) $(IOCORES) \
+						$(I286C)/cpucore.h $(I286C)/i286c.h \
+						$(I286C)/v30patch.h $(I286C)/memory.h \
+						$(I286C)/dmap.h $(BIOS)/bios.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/memory.o		:	$(I286C)/memory.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(I286C)/egcmem.h \
-						$(VRAM)/vram.h $(FONT)/font.h
+						$(I286C)/cpucore.h $(I286C)/memory.h \
+						$(I286C)/egcmem.h $(VRAM)/vram.h $(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/egcmem.o		:	$(I286C)/egcmem.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -248,12 +266,12 @@ $(OBJ)/dmap.o		:	$(I286C)/dmap.c $(HEADE
 
 
 $(OBJ)/iocore.o		:	$(IO)/iocore.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/i286.h $(CBUS)/cbuscore.h \
+						$(FMBOARDS) $(I286C)/cpucore.h $(CBUS)/cbuscore.h \
 						$(SOUND)/sound.h $(CBUS)/cs4231io.h $(IO)/iocore16.tbl
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/artic.o		:	$(IO)/artic.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h
+						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/cgrom.o		:	$(IO)/cgrom.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -261,7 +279,7 @@ $(OBJ)/cgrom.o		:	$(IO)/cgrom.c $(HEADER
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/cpuio.o		:	$(IO)/cpuio.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/i286.h $(SOUND)/sound.h
+						$(FMBOARDS) $(I286C)/cpucore.h $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/crtc.o		:	$(IO)/crtc.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -269,8 +287,8 @@ $(OBJ)/crtc.o		:	$(IO)/crtc.c $(HEADERS)
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/dipsw.o		:	$(IO)/dipsw.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/sysmng.h $(I286C)/i286.h $(SOUND)/sound.h \
-						$(SOUND)/beep.h
+						$(TARGET)/sysmng.h $(I286C)/cpucore.h \
+						$(SOUND)/sound.h $(SOUND)/beep.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/dmac.o		:	$(IO)/dmac.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -281,8 +299,11 @@ $(OBJ)/egc.o		:	$(IO)/egc.c $(HEADERS) $
 						$(I286C)/memory.h $(I286C)/egcmem.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/epsonio.o	:	$(IO)/epsonio.c $(HEADERS) $(PCCORES) $(IOCORES)
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/extmem.o		:	$(IO)/extmem.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h
+						$(I286C)/cpucore.h $(I286C)/memory.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fdc.o		:	$(IO)/fdc.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -293,7 +314,7 @@ $(OBJ)/fdd320.o		:	$(IO)/fdd320.c $(HEAD
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/gdc.o		:	$(IO)/gdc.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/scrnmng.h $(I286C)/i286.h \
+						$(TARGET)/scrnmng.h $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(VRAM)/vram.h $(VRAM)/palettes.h \
 						$(IO)/gdc_cmd.tbl
 	$(CC) $(COPT) -o $@ $<
@@ -306,31 +327,32 @@ $(OBJ)/gdc_pset.o	:	$(IO)/gdc_pset.c $(H
 						$(I286C)/memory.h $(IO)/gdc_pset.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/itf.o		:	$(IO)/itf.c $(HEADERS) $(PCCORES) $(IOCORES)
+$(OBJ)/mouseif.o	:	$(IO)/mouseif.c $(HEADERS) $(PCCORES) $(IOCORES) \
+						$(TARGET)/mousemng.h $(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/mouseif.o	:	$(IO)/mouseif.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/mousemng.h $(I286C)/i286.h
+$(OBJ)/necio.o		:	$(IO)/necio.c $(HEADERS) $(PCCORES) $(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/nmiio.o		:	$(IO)/nmiio.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h
+						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/np2sysp.o	:	$(IO)/np2sysp.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(COMMON)/strres.h $(TARGET)/taskmng.h $(I286C)/i286.h
+						$(COMMON)/strres.h $(TARGET)/taskmng.h \
+						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/pic.o		:	$(IO)/pic.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h
+						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/pit.o		:	$(IO)/pit.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(SOUND)/sound.h $(SOUND)/beep.h
+						$(I286C)/cpucore.h $(SOUND)/sound.h $(SOUND)/beep.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/printif.o	:	$(IO)/printif.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h
+						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/serial.o		:	$(IO)/serial.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -397,7 +419,7 @@ $(OBJ)/amd98.o		:	$(CBUS)/amd98.c $(HEAD
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/pcm86io.o	:	$(CBUS)/pcm86io.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/i286.h $(CBUS)/pcm86io.h \
+						$(FMBOARDS) $(I286C)/cpucore.h $(CBUS)/pcm86io.h \
 						$(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -408,63 +430,64 @@ $(OBJ)/cs4231io.o	:	$(CBUS)/cs4231io.c $
 
 
 $(OBJ)/bios.o		:	$(BIOS)/bios.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/dosio.h $(I286C)/i286.h $(I286C)/memory.h \
-						$(BIOS)/bios.h $(BIOS)/biosmem.h $(LIO)/lio.h \
-						$(FDD)/fddfile.h $(FDD)/fdd_mtr.h $(BIOS)/fdfmt.h \
-						$(BIOS)/keytable.res $(BIOS)/itfrom.res
+						$(TARGET)/dosio.h $(I286C)/cpucore.h \
+						$(I286C)/memory.h $(BIOS)/bios.h $(BIOS)/biosmem.h \
+						$(LIO)/lio.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h \
+						$(BIOS)/fdfmt.h $(BIOS)/keytable.res \
+						$(BIOS)/itfrom.res
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios02.o		:	$(BIOS)/bios02.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h 
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h 
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios08.o		:	$(BIOS)/bios08.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios09.o		:	$(BIOS)/bios09.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios0c.o		:	$(BIOS)/bios0c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h $(BIOS)/rsbios.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios12.o		:	$(BIOS)/bios12.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios13.o		:	$(BIOS)/bios13.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios18.o		:	$(BIOS)/bios18.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h $(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios19.o		:	$(BIOS)/bios19.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h $(BIOS)/rsbios.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios1a.o		:	$(BIOS)/bios1a.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios1b.o		:	$(BIOS)/bios1b.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h \
 						$(FDD)/sxsi.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/bios1c.o		:	$(BIOS)/bios1c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/timemng.h $(I286C)/i286.h \
+						$(TARGET)/timemng.h $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(BASE)/calendar.h \
 						$(BIOS)/bios.h $(BIOS)/biosmem.h 
 	$(CC) $(COPT) -o $@ $<
@@ -472,7 +495,7 @@ $(OBJ)/bios1c.o		:	$(BIOS)/bios1c.c $(HE
 
 
 $(OBJ)/sound.o		:	$(SOUND)/sound.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/soundmng.h $(I286C)/i286.h \
+						$(TARGET)/soundmng.h $(I286C)/cpucore.h \
 						$(SOUND)/sound.h $(SOUND)/sndcsec.h $(SOUND)/beep.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -482,12 +505,12 @@ $(OBJ)/sndcsec.o	:	$(SOUND)/sndcsec.c $(
 
 $(OBJ)/fmboard.o	:	$(SOUND)/fmboard.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(FMBOARDS) $(TARGET)/joymng.h $(TARGET)/soundmng.h \
-						$(I286C)/i286.h $(CBUS)/cbuscore.h $(CBUS)/board14.h \
-						$(CBUS)/board26k.h $(CBUS)/board86.h \
-						$(CBUS)/boardx2.h $(CBUS)/board118.h \
-						$(CBUS)/boardspb.h $(CBUS)/amd98.h $(CBUS)/pcm86io.h \
-						$(CBUS)/cs4231io.h $(SOUND)/sound.h $(SOUND)/beep.h \
-						$(KEYDISP)/keydisp.h
+						$(I286C)/cpucore.h $(CBUS)/cbuscore.h \
+						$(CBUS)/board14.h $(CBUS)/board26k.h \
+						$(CBUS)/board86.h $(CBUS)/boardx2.h \
+						$(CBUS)/board118.h $(CBUS)/boardspb.h \
+						$(CBUS)/amd98.h $(CBUS)/pcm86io.h $(CBUS)/cs4231io.h \
+						$(SOUND)/sound.h $(SOUND)/beep.h $(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fmtimer.o	:	$(SOUND)/fmtimer.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -511,19 +534,22 @@ $(OBJ)/tms3631g.o	:	$(SOUND)/tms3631g.c 
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/opngenc.o	:	$(SOUND)/opngenc.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(SOUND)/sound.h $(KEYDISP)/keydisp.h
+						$(FMBOARDS) $(SOUND)/sound.h $(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/opngeng.o	:	$(SOUND)/opngeng.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(FMBOARDS) $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/opngeng.oa	:	$(X86ASM)/opngeng.x86
+	$(AS) $(AOPT) $< -o $@
+
 $(OBJ)/psggenc.o	:	$(SOUND)/psggenc.c $(HEADERS) $(SOUND)/sound.h \
-						$(SOUND)/psggen.h $(KEYDISP)/keydisp.h
+						$(SOUND)/psggen.h $(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/psggeng.o	:	$(SOUND)/psggeng.c $(HEADERS) $(SOUND)/sound.h \
-						$(SOUND)/psggen.h
+$(OBJ)/psggeng.o	:	$(SOUND)/psggeng.c $(HEADERS) $(COMMON)/parts.h \
+						$(SOUND)/sound.h $(SOUND)/psggen.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/rhythmc.o	:	$(SOUND)/rhythmc.c $(HEADERS) $(COMMON)/wavefile.h \
@@ -543,7 +569,7 @@ $(OBJ)/adpcmg.o		:	$(SOUND)/adpcmg.c $(H
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/pcm86c.o		:	$(SOUND)/pcm86c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/i286.h $(SOUND)/sound.h
+						$(FMBOARDS) $(I286C)/cpucore.h $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/pcm86g.o		:	$(SOUND)/pcm86g.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -630,6 +656,9 @@ $(OBJ)/makegrph.o	:	$(VRAM)/makegrph.c $
 						$(VRAM)/makegrph.mcr
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/makegrph.oa	:	$(X86ASM)/makegrph.x86
+	$(AS) $(AOPT) $< -o $@
+
 $(OBJ)/scrnbmp.o	:	$(VRAM)/scrnbmp.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(COMMON)/bmpdata.h $(VRAM)/scrndraw.h \
 						$(VRAM)/dispsync.h $(VRAM)/palettes.h \
@@ -649,7 +678,8 @@ $(OBJ)/newdisk.o	:	$(FDD)/newdisk.c $(HE
 
 $(OBJ)/fddfile.o	:	$(FDD)/fddfile.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(COMMON)/strres.h $(TARGET)/dosio.h \
-						$(FDD)/fddfile.h $(FDD)/fdd_xdf.h $(FDD)/fdd_d88.h
+						$(TARGET)/sysmng.h $(FDD)/fddfile.h \
+						$(FDD)/fdd_xdf.h $(FDD)/fdd_d88.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fdd_xdf.o	:	$(FDD)/fdd_xdf.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -665,45 +695,45 @@ $(OBJ)/fdd_mtr.o	:	$(FDD)/fdd_mtr.c $(HE
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/sxsi.o		:	$(FDD)/sxsi.c $(HEADERS) $(PCCORES) \
-						$(I286C)/i286.h $(FDD)/sxsi.h
+						$(TARGET)/sysmng.h $(I286C)/cpucore.h $(FDD)/sxsi.h
 	$(CC) $(COPT) -o $@ $<
 
 
 
 $(OBJ)/lio.o		:	$(LIO)/lio.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
 						$(BIOS)/biosmem.h $(VRAM)/vram.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/gscreen.o	:	$(LIO)/gscreen.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(LIO)/lio.h
+						$(I286C)/cpucore.h $(I286C)/memory.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/gview.o		:	$(LIO)/gview.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(LIO)/lio.h
+						$(I286C)/cpucore.h $(I286C)/memory.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/gcolor1.o	:	$(LIO)/gcolor1.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(LIO)/lio.h
+						$(I286C)/cpucore.h $(I286C)/memory.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/gcolor2.o	:	$(LIO)/gcolor2.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/memory.h $(LIO)/lio.h
+						$(I286C)/cpucore.h $(I286C)/memory.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gcls.o		:	$(LIO)/gcls.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/gcls.o		:	$(LIO)/gcls.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gline.o		:	$(LIO)/gline.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/gline.o		:	$(LIO)/gline.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gput1.o		:	$(LIO)/gput1.c $(HEADERS) $(I286C)/i286.h \
+$(OBJ)/gput1.o		:	$(LIO)/gput1.c $(HEADERS) $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -752,9 +782,31 @@ $(OBJ)/fontmake.o	:	$(FONT)/fontmake.c $
 
 
 
+$(OBJ)/cmndraw.o	:	$(GENERIC)/cmndraw.c $(HEADERS) \
+						$(TARGET)/scrnmng.h $(GENERIC)/cmndraw.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/keydisp.o	:	$(GENERIC)/keydisp.c $(HEADERS) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(SOUND)/sound.h \
+						$(GENERIC)/cmndraw.h $(GENERIC)/keydisp.h \
+						$(GENERIC)/keydisp.res
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/dipswbmp.o	:	$(GENERIC)/dipswbmp.c $(HEADERS) $(COMMON)/bmpdata.h \
+						$(GENERIC)/dipswbmp.h $(GENERIC)/dipswbmp.res
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/cmjasts.o	:	$(GENERIC)/cmjasts.c $(HEADERS) $(CPUCORES) \
+						$(TARGET)/commng.h $(SOUND)/sound.h \
+						$(GENERIC)/cmjasts.h
+	$(CC) $(COPT) -o $@ $<
+
+
+
 $(OBJ)/np2.o		:	$(TARGET)/np2.cpp $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(COMMON)/strres.h $(TARGET)/resource.h \
-						$(TARGET)/np2.h $(TARGET)/np2arg.h \
+						$(COMMON)/strres.h $(COMMON)/parts.h \
+						$(TARGET)/resource.h $(TARGET)/np2.h \
+						$(TARGET)/np2arg.h $(X86ASM)/cputype.h \
 						$(TARGET)/dosio.h $(TARGET)/extromio.h \
 						$(TARGET)/commng.h $(TARGET)/joymng.h \
 						$(TARGET)/mousemng.h $(TARGET)/scrnmng.h \
@@ -768,13 +820,16 @@ $(OBJ)/np2.o		:	$(TARGET)/np2.cpp $(HEAD
 						$(SOUND)/sound.h $(SOUND)/beep.h $(SOUND)/s98.h \
 						$(FDD)/diskdrv.h $(FDD)/fddfile.h $(BASE)/timing.h \
 						$(BASE)/statsave.h $(BASE)/debugsub.h \
-						$(KEYDISP)/keydisp.h $(DEBUGUTY)/viewer.h
+						$(GENERIC)/keydisp.h $(DEBUGUTY)/viewer.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/np2arg.o		:	$(TARGET)/np2arg.cpp $(HEADERS) $(TARGET)/np2arg.h \
 						$(TARGET)/dosio.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/cputype.oa	:	$(X86ASM)/cputype.x86
+	$(AS) $(AOPT) $< -o $@
+
 $(OBJ)/dosio.o		:	$(TARGET)/dosio.cpp $(HEADERS) $(TARGET)/dosio.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -804,7 +859,7 @@ $(OBJ)/cmmidi.o		:	$(TARGET)/cmmidi.cpp 
 						$(TARGET)/commng.h $(TARGET)/cmserial.h \
 						$(TARGET)/cmmidi.h $(TARGET)/cmpara.h \
 						$(SOUND)/sound.h $(VERMOUTH)/vermouth.h \
-						$(KEYDISP)/keydisp.h
+						$(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/cmpara.o		:	$(TARGET)/cmpara.cpp
@@ -836,7 +891,7 @@ $(OBJ)/soundmng.o	:	$(TARGET)/soundmng.c
 
 $(OBJ)/sysmng.o		:	$(TARGET)/sysmng.cpp $(HEADERS) $(PCCORES) \
 						$(TARGET)/np2.h $(TARGET)/dosio.h $(TARGET)/sysmng.h \
-						$(I286C)/i286.h $(FDD)/fddfile.h
+						$(I286C)/cpucore.h $(FDD)/fddfile.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/taskmng.o	:	$(TARGET)/taskmng.cpp $(HEADERS) $(TARGET)/taskmng.h
@@ -884,15 +939,36 @@ $(OBJ)/ini.o		:	$(TARGET)/ini.cpp $(HEAD
 $(OBJ)/np2info.o	:	$(TARGET)/np2info.cpp $(HEADERS) $(PCCORES) \
 						$(IOCORES) $(FMBOARDS) $(COMMON)/strres.h \
 						$(TARGET)/np2.h $(TARGET)/scrnmng.h \
-						$(TARGET)/np2info.h $(I286C)/i286.h \
+						$(TARGET)/np2info.h $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/toolwin.o	:	$(TARGET)/toolwin.cpp $(HEADERS) $(PCCORES) \
+						$(COMMON)/strres.h $(TARGET)/resource.h \
+						$(TARGET)/np2.h $(TARGET)/dosio.h $(TARGET)/sysmng.h \
+						$(TARGET)/toolwin.h $(TARGET)/ini.h \
+						$(DIALOG)/dialog.h $(FDD)/diskdrv.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/dd2.o		:	$(TARGET)/dd2.cpp $(HEADERS) $(TARGET)/dd2.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/kdispwin.o	:	$(TARGET)/kdispwin.cpp $(HEADERS) \
+						$(TARGET)/resource.h $(TARGET)/np2.h \
+						$(TARGET)/winloc.h $(TARGET)/soundmng.h \
+						$(TARGET)/sysmng.h $(TARGET)/menu.h $(TARGET)/ini.h \
+						$(TARGET)/dd2.h $(TARGET)/kdispwin.h \
+						$(DIALOG)/np2class.h $(GENERIC)/keydisp.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/np2res.o		:	$(TARGET)/np2res.rc $(TARGET)/resource.h
 	$(RC) -i $< -o $@
 
 
 
+$(OBJ)/np2class.o	:	$(DIALOG)/np2class.cpp $(HEADERS) $(TARGET)/resource.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/d_about.o	:	$(DIALOG)/d_about.cpp $(HEADERS) $(PCCORES) \
 						$(TARGET)/resource.h $(TARGET)/np2.h \
 						$(TARGET)/np2info.h $(DIALOG)/dialog.h \
@@ -909,7 +985,7 @@ $(OBJ)/d_mpu98.o	:	$(DIALOG)/d_mpu98.cpp
 						$(COMMON)/strres.h $(TARGET)/resource.h \
 						$(TARGET)/np2.h $(TARGET)/commng.h \
 						$(TARGET)/sysmng.h $(DIALOG)/dialog.h \
-						$(DIALOG)/dialogs.h $(DIALOG)/bit2res.h
+						$(DIALOG)/dialogs.h $(GENERIC)/dipswbmp.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/d_screen.o	:	$(DIALOG)/d_screen.cpp $(HEADERS) $(PCCORES) \
@@ -924,8 +1000,8 @@ $(OBJ)/d_serial.o	:	$(DIALOG)/d_serial.c
 						$(IOCORES) $(COMMON)/strres.h $(TARGET)/resource.h \
 						$(TARGET)/np2.h $(TARGET)/dosio.h $(TARGET)/commng.h \
 						$(TARGET)/sysmng.h $(DIALOG)/dialog.h \
-						$(DIALOG)/dialogs.h $(DIALOG)/bit2res.h \
-						$(VRAM)/scrndraw.h $(VRAM)/palettes.h
+						$(DIALOG)/dialogs.h $(VRAM)/scrndraw.h \
+						$(VRAM)/palettes.h $(GENERIC)/dipswbmp.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/d_sound.o	:	$(DIALOG)/d_sound.cpp $(HEADERS) $(PCCORES) \
@@ -933,8 +1009,8 @@ $(OBJ)/d_sound.o	:	$(DIALOG)/d_sound.cpp
 						$(TARGET)/resource.h $(TARGET)/np2.h \
 						$(TARGET)/joymng.h $(TARGET)/sysmng.h \
 						$(TARGET)/menu.h $(DIALOG)/dialog.h \
-						$(DIALOG)/dialogs.h $(DIALOG)/bit2res.h \
-						$(SOUND)/sound.h $(SOUND)/s98.h
+						$(DIALOG)/dialogs.h $(SOUND)/sound.h $(SOUND)/s98.h \
+						$(GENERIC)/dipswbmp.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/d_clnd.o		:	$(DIALOG)/d_clnd.cpp $(HEADERS) $(PCCORES) \
@@ -964,44 +1040,12 @@ $(OBJ)/dialogs.o	:	$(DIALOG)/dialogs.cpp
 						$(TARGET)/sysmng.h $(DIALOG)/dialogs.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bit2res.o	:	$(DIALOG)/bit2res.cpp $(HEADERS) $(DIALOG)/bit2res.h
-	$(CC) $(COPT) -o $@ $<
-
-
-
-$(OBJ)/keydisp.o	:	$(KEYDISP)/keydisp.cpp $(HEADERS) \
-						$(TARGET)/resource.h $(TARGET)/np2.h \
-						$(TARGET)/soundmng.h $(KEYDISP)/dd2.h \
-						$(KEYDISP)/keydisp.h $(KEYDISP)/keydisps.h \
-						$(KEYDISP)/keydispr.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/keydisps.o	:	$(KEYDISP)/keydisps.cpp $(HEADERS) \
-						$(TARGET)/resource.h $(KEYDISP)/dd2.h \
-						$(KEYDISP)/dd2sub.h $(KEYDISP)/keydisp.h \
-						$(KEYDISP)/keydisps.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/keydispr.o	:	$(KEYDISP)/keydispr.cpp $(HEADERS) $(PCCORES) \
-						$(IOCORES) $(FMBOARDS) $(TARGET)/resource.h \
-						$(KEYDISP)/dd2.h $(KEYDISP)/keydisp.h \
-						$(KEYDISP)/keydisps.h $(KEYDISP)/keydispr.h \
-						$(SOUND)/sound.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/dd2.o		:	$(KEYDISP)/dd2.cpp $(HEADERS) $(KEYDISP)/dd2.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/dd2sub.o		:	$(KEYDISP)/dd2sub.cpp $(HEADERS) $(KEYDISP)/dd2.h \
-						$(KEYDISP)/dd2sub.h
-	$(CC) $(COPT) -o $@ $<
-
 
 
 $(OBJ)/viewer.o		:	$(DEBUGUTY)/viewer.cpp $(HEADERS) \
 						$(TARGET)/resource.h $(TARGET)/np2.h \
 						$(DEBUGUTY)/viewer.h $(DEBUGUTY)/viewcmn.h \
-						$(I286C)/i286.h
+						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/viewcmn.o	:	$(DEBUGUTY)/viewcmn.cpp $(HEADERS) $(PCCORES) \
@@ -1010,7 +1054,7 @@ $(OBJ)/viewcmn.o	:	$(DEBUGUTY)/viewcmn.c
 						$(DEBUGUTY)/viewmem.h $(DEBUGUTY)/viewreg.h \
 						$(DEBUGUTY)/viewseg.h $(DEBUGUTY)/view1mb.h \
 						$(DEBUGUTY)/viewasm.h $(DEBUGUTY)/viewsnd.h \
-						$(I286C)/i286.h $(I286C)/memory.h $(BIOS)/bios.h
+						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/viewmenu.o	:	$(DEBUGUTY)/viewmenu.cpp $(HEADERS) \
@@ -1028,28 +1072,28 @@ $(OBJ)/viewreg.o	:	$(DEBUGUTY)/viewreg.c
 						$(TARGET)/resource.h $(TARGET)/np2.h \
 						$(DEBUGUTY)/viewer.h $(DEBUGUTY)/viewcmn.h \
 						$(DEBUGUTY)/viewmenu.h $(DEBUGUTY)/viewmem.h \
-						$(DEBUGUTY)/viewreg.h $(I286C)/i286.h
+						$(DEBUGUTY)/viewreg.h $(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/viewseg.o	:	$(DEBUGUTY)/viewseg.cpp $(HEADERS) \
 						$(TARGET)/resource.h $(TARGET)/np2.h \
 						$(DEBUGUTY)/viewer.h $(DEBUGUTY)/viewcmn.h \
 						$(DEBUGUTY)/viewmenu.h $(DEBUGUTY)/viewmem.h \
-						$(DEBUGUTY)/viewseg.h $(I286C)/i286.h
+						$(DEBUGUTY)/viewseg.h $(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/view1mb.o	:	$(DEBUGUTY)/view1mb.cpp $(HEADERS) \
 						$(TARGET)/resource.h $(TARGET)/np2.h \
 						$(DEBUGUTY)/viewer.h $(DEBUGUTY)/viewcmn.h \
 						$(DEBUGUTY)/viewmenu.h $(DEBUGUTY)/viewmem.h \
-						$(DEBUGUTY)/view1mb.h $(I286C)/i286.h
+						$(DEBUGUTY)/view1mb.h $(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/viewasm.o	:	$(DEBUGUTY)/viewasm.cpp $(HEADERS) \
 						$(TARGET)/resource.h $(TARGET)/np2.h \
 						$(DEBUGUTY)/viewer.h $(DEBUGUTY)/viewcmn.h \
 						$(DEBUGUTY)/viewmenu.h $(DEBUGUTY)/viewmem.h \
-						$(DEBUGUTY)/viewsnd.h $(I286C)/i286.h
+						$(DEBUGUTY)/viewsnd.h $(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/viewsnd.o	:	$(DEBUGUTY)/viewsnd.cpp $(HEADERS) $(PCCORES) \
@@ -1067,7 +1111,7 @@ $(OBJ)/unasm.o		:	$(DEBUGUTY)/unasm.cpp 
 
 $(OBJ)/pccore.o		:	$(BASE)/pccore.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(TARGET)/soundmng.h $(TARGET)/sysmng.h \
-						$(TARGET)/timemng.h $(I286C)/i286.h \
+						$(TARGET)/timemng.h $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(CBUS)/cbuscore.h \
 						$(CBUS)/pc9861k.h $(CBUS)/mpu98ii.h $(BIOS)/bios.h \
 						$(VRAM)/vram.h $(VRAM)/scrndraw.h $(VRAM)/dispsync.h \
@@ -1079,7 +1123,8 @@ $(OBJ)/pccore.o		:	$(BASE)/pccore.c $(HE
 						$(BASE)/timing.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/nevent.o		:	$(BASE)/nevent.c $(HEADERS) $(PCCORES) $(I286C)/i286.h
+$(OBJ)/nevent.o		:	$(BASE)/nevent.c $(HEADERS) $(PCCORES) \
+						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/calendar.o	:	$(BASE)/calendar.c $(HEADERS) $(PCCORES) \
@@ -1094,7 +1139,7 @@ $(OBJ)/timing.o		:	$(BASE)/timing.c $(HE
 $(OBJ)/statsave.o	:	$(BASE)/statsave.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(TARGET)/dosio.h $(TARGET)/commng.h \
 						$(TARGET)/scrnmng.h $(TARGET)/soundmng.h \
-						$(TARGET)/timemng.h $(I286C)/i286.h \
+						$(TARGET)/timemng.h $(I286C)/cpucore.h \
 						$(I286C)/memory.h $(CBUS)/cbuscore.h \
 						$(CBUS)/pc9861k.h $(CBUS)/mpu98ii.h \
 						$(CBUS)/board14.h $(BIOS)/bios.h $(VRAM)/vram.h \
@@ -1102,12 +1147,13 @@ $(OBJ)/statsave.o	:	$(BASE)/statsave.c $
 						$(SOUND)/sound.h $(SOUND)/fmboard.h $(SOUND)/beep.h \
 						$(FONT)/font.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h \
 						$(FDD)/sxsi.h $(BASE)/calendar.h $(BASE)/statsave.h \
-						$(KEYDISP)/keydisp.h
+						$(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/debugsub.o	:	$(BASE)/debugsub.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(COMMON)/strres.h $(TARGET)/dosio.h $(I286C)/i286.h \
-						$(I286C)/memory.h $(BASE)/debugsub.h
+						$(COMMON)/strres.h $(TARGET)/dosio.h \
+						$(I286C)/cpucore.h $(I286C)/memory.h \
+						$(BASE)/debugsub.h
 	$(CC) $(COPT) -o $@ $<