--- nono/vm/Makefile 2026/04/29 17:05:24 1.1.1.14 +++ nono/vm/Makefile 2026/04/29 17:05:50 1.1.1.19 @@ -15,14 +15,16 @@ TARGETS= libnnvm.a TARGETS+= test_busio test_windrv .endif -CXXSRCS_vm= \ +CXXSRCS= \ adpcm.cpp \ areaset.cpp \ bankram.cpp \ bootloader.cpp \ bt45x.cpp \ + buserr.cpp \ cgrom.cpp \ cmmu.cpp \ + console.cpp \ crtc.cpp \ crtc2.cpp \ device.cpp \ @@ -41,6 +43,7 @@ CXXSRCS_vm= \ goldfish_tty.cpp \ gvram.cpp \ human68k.cpp \ + iodevstream.cpp \ interrupt.cpp \ iplrom30.cpp \ kbc.cpp \ @@ -68,6 +71,7 @@ CXXSRCS_vm= \ newsfb.cpp \ newsio.cpp \ nmi.cpp \ + nop.cpp \ opm.cpp \ partialram.cpp \ pedec.cpp \ @@ -80,6 +84,7 @@ CXXSRCS_vm= \ qemusysctlr.cpp \ renderer.cpp \ rom.cpp \ + romemu.cpp \ romemu_luna.cpp \ romemu_luna1.cpp \ romemu_luna88k.cpp \ @@ -96,10 +101,12 @@ CXXSRCS_vm= \ scsibus.cpp \ scsicmd.cpp \ scsidev.cpp \ + scsidomain.cpp \ sio.cpp \ spc.cpp \ sprite.cpp \ sram.cpp \ + ssg.cpp \ subram.cpp \ syncer.cpp \ sysclk.cpp \ @@ -115,7 +122,9 @@ CXXSRCS_vm= \ virtio_base.cpp \ virtio_block.cpp \ virtio_def.cpp \ + virtio_entropy.cpp \ virtio_net.cpp \ + virtio_scsi.cpp \ vm.cpp \ vm_luna.cpp \ vm_news.cpp \ @@ -127,22 +136,25 @@ CXXSRCS_vm= \ xpbus.cpp \ .if "${HOST_HAS_AVX2}" == "yes" -CXXSRCS_vm+= accel_avx2.cpp +CXXSRCS+= accel_avx2.cpp CXXFLAGS.accel_avx2.cpp+= -mavx2 .endif +.if "${HOST_HAS_NEON}" == "yes" +CXXSRCS+= accel_neon.cpp +.endif CXXSRCS_test= \ test_busio.cpp \ test_tool.cpp \ test_windrv.cpp \ -CXXSRCS= ${CXXSRCS_vm} ${CXXSRCS_test} +CXXSRCS_all= ${CXXSRCS} ${CXXSRCS_test} -OBJS_vm= ${CXXSRCS_vm:.cpp=.o} +OBJS= ${CXXSRCS:.cpp=.o} CLEANFILES+= gencgrom -libnnvm.a: ${OBJS_vm} +libnnvm.a: ${OBJS} rm -f $@ ${AR} r $@ $> ${RANLIB} $@ @@ -150,8 +162,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} + ${CXX} ${LDFLAGS} -o $@ $> ${LIBS} .include "../Makefile.rule"