--- nono/vm/Makefile 2026/04/29 17:05:17 1.1.1.12 +++ nono/vm/Makefile 2026/04/29 17:05:37 1.1.1.17 @@ -11,17 +11,19 @@ .include "../Makefile.inc" TARGETS= libnnvm.a -.if !defined(NOTEST) -TARGETS+= test_busio +.if !defined(RELEASE) +TARGETS+= test_busio test_windrv .endif CXXSRCS_vm= \ adpcm.cpp \ areaset.cpp \ + bankram.cpp \ bootloader.cpp \ bt45x.cpp \ cgrom.cpp \ cmmu.cpp \ + console.cpp \ crtc.cpp \ crtc2.cpp \ device.cpp \ @@ -29,13 +31,18 @@ CXXSRCS_vm= \ dmac.cpp \ ethernet.cpp \ event.cpp \ + extarea.cpp \ extram.cpp \ fdc.cpp \ fdd.cpp \ fuserom.cpp \ + goldfish_pic.cpp \ + goldfish_rtc.cpp \ + goldfish_timer.cpp \ + goldfish_tty.cpp \ gvram.cpp \ human68k.cpp \ - human_mi.cpp \ + iodevstream.cpp \ interrupt.cpp \ iplrom30.cpp \ kbc.cpp \ @@ -45,6 +52,10 @@ CXXSRCS_vm= \ lunafb.cpp \ lunakbd.cpp \ mainbus.cpp \ + mainbus_luna.cpp \ + mainbus_news.cpp \ + mainbus_virt68k.cpp \ + mainbus_x68k.cpp \ mainram.cpp \ mfp.cpp \ mk48t02.cpp \ @@ -54,6 +65,7 @@ CXXSRCS_vm= \ mpu680x0.cpp \ mpu88xx0.cpp \ msxdos.cpp \ + nereid.cpp \ newsctlr.cpp \ newsfb.cpp \ newsio.cpp \ @@ -67,16 +79,20 @@ CXXSRCS_vm= \ power.cpp \ printer.cpp \ prom.cpp \ + qemusysctlr.cpp \ renderer.cpp \ rom.cpp \ + romemu.cpp \ romemu_luna.cpp \ romemu_luna1.cpp \ romemu_luna88k.cpp \ romemu_news.cpp \ + romemu_virt68k.cpp \ romemu_x68k.cpp \ romimg_x68k.cpp \ rp5c15.cpp \ rtc.cpp \ + rtl8019as.cpp \ scc.cpp \ scheduler.cpp \ scsi.cpp \ @@ -87,6 +103,7 @@ CXXSRCS_vm= \ spc.cpp \ sprite.cpp \ sram.cpp \ + ssg.cpp \ subram.cpp \ syncer.cpp \ sysclk.cpp \ @@ -97,18 +114,35 @@ CXXSRCS_vm= \ tvram.cpp \ ufs.cpp \ uimessage.cpp \ + v68kio.cpp \ videoctlr.cpp \ + virtio_base.cpp \ + virtio_block.cpp \ + virtio_def.cpp \ + virtio_entropy.cpp \ + virtio_net.cpp \ vm.cpp \ vm_luna.cpp \ vm_news.cpp \ + vm_virt68k.cpp \ vm_x68k.cpp \ + windrv.cpp \ x68kio.cpp \ x68kkbd.cpp \ xpbus.cpp \ +.if "${HOST_HAS_AVX2}" == "yes" +CXXSRCS_vm+= accel_avx2.cpp +CXXFLAGS.accel_avx2.cpp+= -mavx2 +.endif +.if "${HOST_HAS_NEON}" == "yes" +CXXSRCS_vm+= accel_neon.cpp +.endif + CXXSRCS_test= \ test_busio.cpp \ test_tool.cpp \ + test_windrv.cpp \ CXXSRCS= ${CXXSRCS_vm} ${CXXSRCS_test} @@ -124,4 +158,13 @@ libnnvm.a: ${OBJS_vm} test_busio: test_busio.o ${CXX} ${LDFLAGS} -o $@ $> +test_ethernet: test_ethernet.o ../lib/libnnlib.a + ${CXX} ${LDFLAGS} -o $@ $> + +test_ethernet.o: test_ethernet.cpp ethernet.cpp + +# LIBS は libbsd のため。 +test_windrv: test_windrv.o ../lib/libnnlib.a + ${CXX} ${LDFLAGs} -o $@ $> ${LIBS} + .include "../Makefile.rule"