--- cf/Makefile	2018/04/24 17:57:44	1.1.1.3
+++ cf/Makefile	2018/04/24 17:59:32	1.1.1.5
@@ -1,4 +1,4 @@
-# Makefile for Dynamips 0.2.4
+# Makefile for Dynamips 0.2.5
 # Copyright (c) 2005-2006 Christophe Fillot.
 
 # Replace x86 by amd64 for a build on x86_64.
@@ -6,14 +6,21 @@
 DYNAMIPS_ARCH?=x86
 
 # Change this to 0 if your system doesn't support RFC 2553 extensions
-HAS_RFC2553=1
+HAS_RFC2553?=1
 
 # Change this to 1 if your system has libpcap-0.9.4 or better 
 # (WinPcap is used for Cygwin)
 HAS_PCAP?=1
 
 # Current dynamips release
-VERSION=0.2.4
+VERSION_TRAIN=0.2.6
+VERSION_SUB=-RC1
+
+VERSION=$(VERSION_TRAIN)$(VERSION_SUB)
+VERSION_DEV=$(VERSION_TRAIN)-$(shell date +%Y%m%d-%H)
+
+# Executable binary extension
+BIN_EXT?=
 
 CC?=gcc
 LD=ld
@@ -22,12 +29,14 @@ TAR=tar
 CP=cp
 LEX=flex
 ARCH_INC_FILE=\"$(DYNAMIPS_ARCH)_trans.h\"
-CFLAGS+=-g -Wall -O3 -fomit-frame-pointer -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \
+CFLAGS+=-g -Wall -O3 -fomit-frame-pointer \
+	-DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \
 	-DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \
 	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
 	-DHAS_RFC2553=$(HAS_RFC2553)
 
-PCAP_LIB=-lpcap
+PCAP_LIB=/usr/local/lib/libpcap.a
+#PCAP_LIB=-lpcap
 
 ifeq ($(shell uname), FreeBSD)
    PTHREAD_LIBS?=-pthread
@@ -35,40 +44,54 @@ ifeq ($(shell uname), FreeBSD)
    LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS)
 else
 ifeq ($(shell uname -s), Darwin)
-   CFLAGS+=-I/usr/local/include
+   CFLAGS+=-I/usr/local/include -mdynamic-no-pic
    LIBS=-L/usr/local/lib -L. -lelf -lpthread
 else
 ifeq ($(shell uname -o), Cygwin)
-   CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf
+   CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN
    LIBS=-L/usr/local/lib -L. -lelf -lpthread
    PCAP_LIB=-lpacket -lwpcap
 else
-   LIBS=-L. -lelf -lpthread
+   CFLAGS+=-I/usr/include/libelf
+   LIBS=-L. /usr/lib/libelf.a -lpthread
 endif
 endif
 endif
 
-PROG=dynamips
+PROG=dynamips$(BIN_EXT)
 PACKAGE=$(PROG)-$(VERSION)
 ARCHIVE=$(PACKAGE).tar.gz
 
+PACKAGE_DEV=$(PROG)-$(VERSION_DEV)
+ARCHIVE_DEV=$(PACKAGE_DEV).tar.gz
+
 # Header and source files
-HDR=mempool.h cfg_lexer.h cfg_parser.h rbtree.h hash.h utils.h crc.h \
-	net.h net_io.h net_io_bridge.h atm.h frame_relay.h \
-	ptask.h dynamips.h insn_lookup.h \
-	mips64.h mips64_exec.h cpu.h cp0.h memory.h device.h \
-	nmc93c46.h ds1620.h pci_dev.h pcireg.h \
-	dev_vtty.h dev_c7200.h dev_c7200_bay.h
-SOURCES=mempool.c cfg_lexer.c cfg_parser.c rbtree.c hash.c utils.c crc.c \
-	net.c net_io.c net_io_bridge.c atm.c frame_relay.c ptask.c \
-	dynamips.c insn_lookup.c mips64.c mips64_jit.c mips64_exec.c \
-	cpu.c cp0.c memory.c device.c nmc93c46.c pci_dev.c pci_io.c \
-	dev_zero.c dev_vtty.c dev_nvram.c dev_rom.c dev_bootflash.c \
-	dev_clpd6729.c dev_iofpga.c dev_mpfpga.c dev_gt64k.c \
-	dev_dec21x50.c dev_pericom.c dev_remote.c \
-	dev_c7200.c dev_c7200_bay.c dev_c7200_sram.c dev_dec21140.c \
-	dev_c7200_serial.c dev_c7200_pos.c dev_pa_a1.c \
-	dev_sb1_duart.c
+HDR=mempool.h registry.h rbtree.h hash.h utils.h parser.h \
+	crc.h base64.h net.h net_io.h net_io_bridge.h net_io_filter.h \
+	atm.h frame_relay.h eth_switch.h \
+	ptask.h hypervisor.h dynamips.h insn_lookup.h \
+	vm.h mips64.h mips64_exec.h cpu.h cp0.h memory.h device.h \
+	nmc93c46.h cisco_eeprom.h ds1620.h pci_dev.h pci_io.h \
+	dev_dec21140.h dev_am79c971.h dev_mueslix.h \
+	dev_vtty.h dev_c7200.h dev_c3600.h dev_c3600_bay.h
+SOURCES=mempool.c registry.c rbtree.c hash.c utils.c parser.c ptask.c \
+	crc.c base64.c net.c net_io.c net_io_bridge.c net_io_filter.c \
+	atm.c frame_relay.c eth_switch.c \
+	dynamips.c insn_lookup.c vm.c mips64.c mips64_jit.c mips64_exec.c \
+	cpu.c cp0.c memory.c device.c nmc93c46.c cisco_eeprom.c \
+	pci_dev.c pci_io.c \
+	dev_zero.c dev_vtty.c dev_ram.c dev_rom.c dev_nvram.c dev_bootflash.c \
+	dev_remote.c dev_clpd6729.c dev_pcmcia_disk.c dev_gt64k.c \
+	dev_plx9060.c dev_dec21x50.c dev_pericom.c dev_ap1011.c \
+	dev_ns16552.c dev_dec21140.c dev_am79c971.c dev_mueslix.c \
+	dev_c3600.c dev_c3600_bay.c dev_c3600_iofpga.c \
+	dev_c3600_eth.c dev_c3600_serial.c dev_c3600_esw.c \
+	dev_c7200.c dev_c7200_iofpga.c dev_c7200_mpfpga.c \
+	dev_c7200_sram.c dev_c7200_eth.c dev_c7200_serial.c dev_c7200_pos.c \
+	dev_c7200_bri.c \
+	dev_pa_a1.c dev_sb1.c dev_sb1_io.c dev_sb1_pci.c hypervisor.c \
+	hv_nio.c hv_nio_bridge.c hv_frsw.c hv_atmsw.c hv_ethsw.c \
+	hv_vm.c hv_vm_debug.c hv_c7200.c hv_c3600.c
 
 # Profiling
 #SOURCES += profiler.c
@@ -77,6 +100,8 @@ SOURCES=mempool.c cfg_lexer.c cfg_parser
 ifeq ($(DYNAMIPS_ARCH),x86)
 HDR += x86-codegen.h x86_trans.h
 SOURCES += x86_trans.c
+ASMSRC += x86_asm.S
+CFLAGS += -DFAST_ASM
 endif
 
 ifeq ($(DYNAMIPS_ARCH),amd64)
@@ -105,31 +130,51 @@ SOURCES += gen_eth.c
 LIBS += $(PCAP_LIB)
 endif
 
-LEX_SOURCES=cfg_lexer.l
-
-OBJS=$(SOURCES:.c=.o)
+C_OBJS=$(SOURCES:.c=.o)
+A_OBJS=$(ASMSRC:.S=.o)
 LEX_C=$(LEX_SOURCES:.l=.c)
 
-SUPPL=Makefile ChangeLog README TODO microcode
+SUPPL=Makefile ChangeLog COPYING README README.hypervisor TODO \
+	dynamips.1 nvram_export.1 hypervisor_mode.7 microcode
 FILE_LIST := $(HDR) $(SOURCES) $(SUPPL) \
-	x86-codegen.h x86_trans.c x86_trans.h \
+	x86-codegen.h x86_trans.c x86_trans.h x86_asm.S \
 	amd64-codegen.h amd64_trans.c amd64_trans.h \
-	nojit_trans.c nojit_trans.h \
+	nojit_trans.c nojit_trans.h asmdefs.c \
 	linux_eth.c linux_eth.h gen_eth.c gen_eth.h \
-	cfg_lexer.l profiler.c profiler_resolve.pl bin2c.c rom2c.c
+	profiler.c profiler_resolve.pl bin2c.c rom2c.c \
+	nvram_export.c
 
-dynamips: microcode $(LEX_C) $(OBJS)
-	@echo "Linking $(PROG)"
-	@$(CC) -o $(PROG) $(OBJS) $(LIBS)
-
-.PHONY: microcode
-microcode: 
-	@$(CC) -Wall $(CFLAGS) -o rom2c rom2c.c $(LIBS)
+.PHONY: all
+all: $(PROG) nvram_export
+
+$(PROG): microcode_dump.inc asmdefs.h $(LEX_C) $(C_OBJS) $(A_OBJS)
+	@echo "Linking $@"
+	@$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
+
+rom2c$(BIN_EXT): rom2c.c
+	@echo "Linking $@"
+	@$(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)
+
+microcode_dump.inc: rom2c$(BIN_EXT) microcode
+	@$(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)
 	@./rom2c microcode microcode_dump.inc
 
+asmdefs$(BIN_EXT): asmdefs.c mips64.h
+	@echo "Linking $@"
+	@$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
+
+asmdefs.h: asmdefs$(BIN_EXT)
+	@echo "Building assembly definitions header file"
+	@./asmdefs
+
+nvram_export$(BIN_EXT): nvram_export.c
+	@echo "Linking $@"
+	@$(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
+
 .PHONY: clean
 clean:
-	$(RM) -f microcode_dump.inc $(OBJS) $(PROG)
+	$(RM) -f rom2c$(BIN_EXT) microcode_dump.inc asmdefs$(BIN_EXT) \
+	asmdefs.h $(C_OBJS) $(A_OBJS) $(PROG)
 	$(RM) -f *~
 
 .PHONY: package
@@ -138,7 +183,17 @@ package:
 	@$(CP) $(FILE_LIST) distrib/$(PACKAGE)
 	@cd distrib ; $(TAR) czf $(ARCHIVE) $(PACKAGE)
 
-.SUFFIXES: .c .h .l .y .o
+.PHONY: packdev
+packdev:
+	@mkdir -p distrib/$(PACKAGE_DEV)
+	@$(CP) $(FILE_LIST) distrib/$(PACKAGE_DEV)
+	@cd distrib ; $(TAR) czf $(ARCHIVE_DEV) $(PACKAGE_DEV)
+
+.SUFFIXES: .c .h .S .l .y .o
+
+.S.o:
+	@echo "Assembling $<"
+	@$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
 
 .c.o:
 	@echo "Compiling $<"