Hello community, here is the log from the commit of package dynamips for openSUSE:Factory checked in at 2015-06-05 08:46:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dynamips (Old) and /work/SRC/openSUSE:Factory/.dynamips.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dynamips" Changes: -------- --- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes 2014-12-01 14:01:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2015-06-05 08:46:15.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 4 16:39:22 UTC 2015 - [email protected] + +- New upstream version 0.2.15 + * minor fixes for OSX +- removed dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch + +------------------------------------------------------------------- Old: ---- dynamips-0.2.14.tar.gz dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch New: ---- dynamips-0.2.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dynamips.spec ++++++ --- /var/tmp/diff_new_pack.jEiLYJ/_old 2015-06-05 08:46:16.000000000 +0200 +++ /var/tmp/diff_new_pack.jEiLYJ/_new 2015-06-05 08:46:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: dynamips -Version: 0.2.14 +Version: 0.2.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -33,7 +33,6 @@ %endif %endif Source: %{name}-%{version}.tar.gz -Patch0: dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch Summary: Cisco router Emulator License: GPL-2.0+ Group: System/Emulators/Other @@ -49,7 +48,6 @@ %prep %setup -q -%patch0 -p1 %build mkdir build ++++++ dynamips-0.2.14.tar.gz -> dynamips-0.2.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/.gitignore new/dynamips-0.2.15/.gitignore --- old/dynamips-0.2.14/.gitignore 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/.gitignore 2015-06-02 15:01:25.000000000 +0200 @@ -3,3 +3,13 @@ .project /build/* /CMakeLists.txt.* +unstable/stable +unstable/man +unstable/c7200_i0_log.txt +unstable/CMakeCache.txt +unstable/CMakeFiles +unstable/Makefile +unstable/cmake_install.cmake +unstable/cmake_uninstall.cmake +unstable/common +unstable/unstable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/CMakeLists.txt new/dynamips-0.2.15/CMakeLists.txt --- old/dynamips-0.2.14/CMakeLists.txt 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/CMakeLists.txt 2015-06-02 15:01:25.000000000 +0200 @@ -25,13 +25,18 @@ message ( STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}" ) project ( dynamips C ) -set ( DYNAMIPS_VERSION_TRAIN 0.2.14 ) +set ( DYNAMIPS_VERSION_TRAIN 0.2.15 ) set ( DYNAMIPS_VERSION_SUB ) include ( utils ) include ( dependencies ) include ( configure ) +if(APPLE) + include_directories(include /usr/local/include/) + include_directories(include /opt/local/include/) +endif() + add_subdirectory ( man ) add_subdirectory ( common ) add_subdirectory ( stable ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/ChangeLog new/dynamips-0.2.15/ChangeLog --- old/dynamips-0.2.14/ChangeLog 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/ChangeLog 2015-06-02 15:01:25.000000000 +0200 @@ -2944,3 +2944,18 @@ | Release: v0.2.14 | +--------------------+ +06-Dec-2014 +----------- + - Rename _unused to _Unused to fix a clash when building on PPC/PPC64EL + * See thread starting at: + https://lists.debian.org/debian-mentors/2014/10/msg00272.html + ++--------------------+ +| Release: v0.2.15 | ++--------------------+ + +01-06-2015 +---------- + +Fixed issue #60 - build on Mac OS X +Fixed packet capture on Mac OS X (echoed packets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/README.md new/dynamips-0.2.15/README.md --- old/dynamips-0.2.14/README.md 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/README.md 2015-06-02 15:01:25.000000000 +0200 @@ -43,6 +43,17 @@ - uuid-dev - libpcap0.8-dev +On Redhat based systems (CentOS, Fedora etc) the following build dependencies are +required and can be installed using yum: +- elfutils-libelf-devel +- libuuid-devel +- libpcap-devel + +MacPort & Homebrew: +- libelf +- cmake + + Similar packages should be available for most distributions, consult your distributions package list to find them. @@ -59,6 +70,11 @@ cmake .. ``` +On OSX Yosemite you need to force usage of GCC 4.9: +``` +cmake .. -DCMAKE_C_COMPILER=/usr/local/bin/gcc-4.9 +``` + This will generate the Makefiles required for compiling Dynamips. To just build Dynamips simple run: @@ -77,6 +93,13 @@ cmake -DCMAKE_INSTALL_PREFIX=/target/path .. ``` +### Releasing + +* Update ChangeLog +* In common/dynamips.c update sw_version_tag with date +* Update RELEASE-NOTE +* git tag the release + ### Useful Information Website: http://www.gns3.net/dynamips/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/RELEASE-NOTES new/dynamips-0.2.15/RELEASE-NOTES --- old/dynamips-0.2.14/RELEASE-NOTES 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/RELEASE-NOTES 2015-06-02 15:01:25.000000000 +0200 @@ -1,30 +1,20 @@ Release Notes for Cisco router simulator (Dynamips) =================================================== -Version: v0.2.14 +Version: v0.2.15 -Release date: Tuesday, September 23, 2014 (2014-09-23) +Release date: Monday, June 1st, 2015 (2015-06-01) -Source code: https://github.com/GNS3/dynamips/tree/v0.2.14 +Source code: https://github.com/GNS3/dynamips/tree/v0.2.15 License: GNU GPLv2 -What's New since v0.2.13 +What's New since v0.2.14 ======================== -Allow building unstable version on MacOSX -Add optional argument 'format' to hypervisor commands 'send_con_msg' and -'send_aux_msg'. Report "X byte(s) written" on succeess. - - String formats: - * plain - plain string (default, old behavior) - * base64 - base64 encoded string -Fix issue with 7200 IOS crashing after restart - -Fixed issue #49 - IOS crashes after router restart -Fixed issue #50 - vm send_con_msg -Fixed issue #55 - 'unstable' installs 'stable' version on Mac OS X - +Allow building unstable version on Mac OS X +Fixes issue with packet capture on Mac OS X Known Issues ============ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/cmake/configure.cmake new/dynamips-0.2.15/cmake/configure.cmake --- old/dynamips-0.2.14/cmake/configure.cmake 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/cmake/configure.cmake 2015-06-02 15:01:25.000000000 +0200 @@ -33,9 +33,6 @@ list ( APPEND DYNAMIPS_DEFINITIONS "-DJIT_ARCH=${JIT_ARCH}" "-DJIT_CPU=${JIT_CPU}" "-DMIPS64_ARCH_INC_FILE=${MIPS64_ARCH_INC_FILE}" "-DPPC32_ARCH_INC_FILE=${PPC32_ARCH_INC_FILE}" ) -if ( APPLE AND "amd64" STREQUAL "${DYNAMIPS_ARCH}" ) - list ( APPEND DYNAMIPS_DEFINITIONS "-DMAC64HACK" ) -endif() print_variables ( DYNAMIPS_ARCH ) # Target code: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/cmake/dependencies.cmake new/dynamips-0.2.15/cmake/dependencies.cmake --- old/dynamips-0.2.14/cmake/dependencies.cmake 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/cmake/dependencies.cmake 2015-06-02 15:01:25.000000000 +0200 @@ -15,21 +15,26 @@ message ( STATUS "dependencies - BEGIN" ) -# gnu compiler -if ( NOT CMAKE_COMPILER_IS_GNUCC AND NOT ANY_COMPILER ) +if ( "${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" ) + set ( CMAKE_COMPILER_IS_CLANG 1 ) +endif() + +# compiler check +if ( NOT CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_COMPILER_IS_CLANG AND NOT ANY_COMPILER ) print_variables ( CMAKE_COMPILER_IS_GNUCC + CMAKE_COMPILER_IS_CLANG CMAKE_C_COMPILER CMAKE_C_COMPILER_ABI CMAKE_C_COMPILER_ID CMAKE_C_COMPILER_VERSION ) message ( FATAL_ERROR - "Not a GNU C compiler. " - "The source and build system assumes gcc so it might not compile. " + "Not a GNU C or Clang compiler. " + "The source and build system assumes gcc or clang so it might not compile. " "Invoke cmake with -DANY_COMPILER=1 to skip this check. " ) -endif ( NOT CMAKE_COMPILER_IS_GNUCC AND NOT ANY_COMPILER ) +endif ( NOT CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_COMPILER_IS_CLANG AND NOT ANY_COMPILER ) set ( DYNAMIPS_FLAGS -Wall -O2 -fomit-frame-pointer ) set ( DYNAMIPS_DEFINITIONS ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/dev_c6msfc1.c new/dynamips-0.2.15/common/dev_c6msfc1.c --- old/dynamips-0.2.14/common/dev_c6msfc1.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/dev_c6msfc1.c 2015-06-02 15:01:25.000000000 +0200 @@ -246,7 +246,7 @@ } /* Set the base MAC address of the chassis */ -_unused static int c6msfc1_burn_mac_addr(c6msfc1_t *router,n_eth_addr_t *addr) +_Unused static int c6msfc1_burn_mac_addr(c6msfc1_t *router,n_eth_addr_t *addr) { m_uint8_t eeprom_ver; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/dev_c7200_bri.c new/dynamips-0.2.15/common/dev_c7200_bri.c --- old/dynamips-0.2.14/common/dev_c7200_bri.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/dev_c7200_bri.c 2015-06-02 15:01:25.000000000 +0200 @@ -326,7 +326,7 @@ } /* Fetch a timeslot assignment */ -_unused static int m32_fetch_ts_assign(struct m32_data *d,u_int ts_id) +_Unused static int m32_fetch_ts_assign(struct m32_data *d,u_int ts_id) { m_uint32_t offset; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/dev_mpc860.c new/dynamips-0.2.15/common/dev_mpc860.c --- old/dynamips-0.2.14/common/dev_mpc860.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/dev_mpc860.c 2015-06-02 15:01:25.000000000 +0200 @@ -423,7 +423,7 @@ return(d->dpram[offset]); } -_unused static inline void dpram_w8(struct mpc860_data *d,m_uint16_t offset, +_Unused static inline void dpram_w8(struct mpc860_data *d,m_uint16_t offset, m_uint8_t val) { d->dpram[offset] = val; @@ -456,7 +456,7 @@ return(val); } -_unused static inline void dpram_w32(struct mpc860_data *d,m_uint16_t offset, +_Unused static inline void dpram_w32(struct mpc860_data *d,m_uint16_t offset, m_uint32_t val) { d->dpram[offset] = val >> 24; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/dev_mv64460.c new/dynamips-0.2.15/common/dev_mv64460.c --- old/dynamips-0.2.14/common/dev_mv64460.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/dev_mv64460.c 2015-06-02 15:01:25.000000000 +0200 @@ -1125,7 +1125,7 @@ } /* Handle RX packet for a SDMA channel */ -_unused static int mv64460_sdma_handle_rx_pkt(netio_desc_t *nio, +_Unused static int mv64460_sdma_handle_rx_pkt(netio_desc_t *nio, u_char *pkt,ssize_t pkt_len, struct mv64460_data *d,void *arg) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/dev_nm_16esw.c new/dynamips-0.2.15/common/dev_nm_16esw.c --- old/dynamips-0.2.14/common/dev_nm_16esw.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/dev_nm_16esw.c 2015-06-02 15:01:25.000000000 +0200 @@ -874,7 +874,7 @@ } /* Dump a table (for debugging) */ -_unused static int bcm5600_table_dump(struct nm_16esw_data *d,m_uint32_t addr) +_Unused static int bcm5600_table_dump(struct nm_16esw_data *d,m_uint32_t addr) { struct bcm5600_table *table; m_uint32_t *entry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/dev_pa_mc8te1.c new/dynamips-0.2.15/common/dev_pa_mc8te1.c --- old/dynamips-0.2.14/common/dev_pa_mc8te1.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/dev_pa_mc8te1.c 2015-06-02 15:01:25.000000000 +0200 @@ -144,7 +144,7 @@ /* * pa_mc8te1_access() */ -_unused static void *pa_mc8te1_access(cpu_gen_t *cpu,struct vdevice *dev, +_Unused static void *pa_mc8te1_access(cpu_gen_t *cpu,struct vdevice *dev, m_uint32_t offset,u_int op_size,u_int op_type, m_uint64_t *data) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/dynamips.c new/dynamips-0.2.15/common/dynamips.c --- old/dynamips-0.2.14/common/dynamips.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/dynamips.c 2015-06-02 15:01:25.000000000 +0200 @@ -74,7 +74,7 @@ const char *sw_version = DYNAMIPS_VERSION"-"JIT_ARCH; /* Software version tag */ -const char *sw_version_tag = "2014092320"; +const char *sw_version_tag = "2015060118"; /* Hypervisor */ int hypervisor_mode = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/dynamips_common.h new/dynamips-0.2.15/common/dynamips_common.h --- old/dynamips-0.2.14/common/dynamips_common.h 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/dynamips_common.h 2015-06-02 15:01:25.000000000 +0200 @@ -80,9 +80,9 @@ #define fastcall #endif -#ifndef _unused +#ifndef _Unused /* Function that is never used */ -#define _unused __attribute__((unused)) +#define _Unused __attribute__((unused)) #endif #ifndef _maybe_used diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/eth_switch.c new/dynamips-0.2.15/common/eth_switch.c --- old/dynamips-0.2.14/common/eth_switch.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/eth_switch.c 2015-06-02 15:01:25.000000000 +0200 @@ -359,9 +359,10 @@ static int ethsw_recv_pkt(netio_desc_t *nio,u_char *pkt,ssize_t pkt_len, ethsw_table_t *t) { - ETHSW_LOCK(t); - ethsw_receive(t,nio,pkt,pkt_len); - ETHSW_UNLOCK(t); + if (ETHSW_TRYLOCK(t) == 0) { + ethsw_receive(t,nio,pkt,pkt_len); + ETHSW_UNLOCK(t); + } return(0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/eth_switch.h new/dynamips-0.2.15/common/eth_switch.h --- old/dynamips-0.2.14/common/eth_switch.h 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/eth_switch.h 2015-06-02 15:01:25.000000000 +0200 @@ -74,6 +74,7 @@ #define ETHSW_LOCK(t) pthread_mutex_lock(&(t)->lock) #define ETHSW_UNLOCK(t) pthread_mutex_unlock(&(t)->lock) +#define ETHSW_TRYLOCK(t) pthread_mutex_trylock(&(t)->lock) /* Acquire a reference to an Ethernet switch (increment reference count) */ ethsw_table_t *ethsw_acquire(char *name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/fs_nvram.c new/dynamips-0.2.15/common/fs_nvram.c --- old/dynamips-0.2.14/common/fs_nvram.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/fs_nvram.c 2015-06-02 15:01:25.000000000 +0200 @@ -357,7 +357,7 @@ /** Write a 32-bit value to NVRAM. */ -_unused static void fs_nvram_write32(fs_nvram_t *fs,u_int offset,m_uint32_t val) +_Unused static void fs_nvram_write32(fs_nvram_t *fs,u_int offset,m_uint32_t val) { fs->write_byte(fs,offset,val >> 24); fs->write_byte(fs,offset+1,val >> 16); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/gen_eth.c new/dynamips-0.2.15/common/gen_eth.c --- old/dynamips-0.2.14/common/gen_eth.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/gen_eth.c 2015-06-02 15:01:25.000000000 +0200 @@ -46,7 +46,12 @@ if (!(p = pcap_open_live(device,65535,TRUE,10,pcap_errbuf))) goto pcap_error; + +#ifdef __APPLE__ + pcap_setdirection(p,PCAP_D_IN); +#else pcap_setdirection(p,PCAP_D_INOUT); +#endif /* __APPLE__ */ #ifdef BIOCFEEDBACK { int on = 1; @@ -55,18 +60,18 @@ #endif #else p = pcap_open(device,65535, - PCAP_OPENFLAG_PROMISCUOUS | + PCAP_OPENFLAG_PROMISCUOUS | PCAP_OPENFLAG_NOCAPTURE_LOCAL | PCAP_OPENFLAG_MAX_RESPONSIVENESS | PCAP_OPENFLAG_NOCAPTURE_RPCAP, 10,NULL,pcap_errbuf); - + if (!p) goto pcap_error; #endif return p; - + pcap_error: fprintf(stderr,"gen_eth_init: unable to open device '%s' " "with PCAP (%s)\n",device,pcap_errbuf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/insn_lookup.c new/dynamips-0.2.15/common/insn_lookup.c --- old/dynamips-0.2.14/common/insn_lookup.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/insn_lookup.c 2015-06-02 15:01:25.000000000 +0200 @@ -348,7 +348,7 @@ } /* Dump an instruction lookup table */ -_unused static int ilt_dump(char *table_name,insn_lookup_t *ilt) +_Unused static int ilt_dump(char *table_name,insn_lookup_t *ilt) { rfc_array_t *rfct; char *filename; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/rbtree.c new/dynamips-0.2.15/common/rbtree.c --- old/dynamips-0.2.14/common/rbtree.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/rbtree.c 2015-06-02 15:01:25.000000000 +0200 @@ -57,7 +57,7 @@ } /* Returns the node which represents the maximum value */ -_unused static inline rbtree_node *rbtree_max(rbtree_tree *tree,rbtree_node *x) +_Unused static inline rbtree_node *rbtree_max(rbtree_tree *tree,rbtree_node *x) { while(!NIL(tree,x->right)) x = x->right; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/common/timer.c new/dynamips-0.2.15/common/timer.c --- old/dynamips-0.2.14/common/timer.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/common/timer.c 2015-06-02 15:01:25.000000000 +0200 @@ -125,7 +125,7 @@ } /* Add a timer in a queue atomically */ -_unused static inline void timer_add_to_queue_atomic(timer_queue_t *queue, +_Unused static inline void timer_add_to_queue_atomic(timer_queue_t *queue, timer_entry_t *timer) { TIMERQ_LOCK(queue); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/stable/CMakeLists.txt new/dynamips-0.2.15/stable/CMakeLists.txt --- old/dynamips-0.2.14/stable/CMakeLists.txt 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/stable/CMakeLists.txt 2015-06-02 15:01:25.000000000 +0200 @@ -78,6 +78,12 @@ return () endif ( NOT BUILD_DYNAMIPS_STABLE ) +# set MAC64HACK on stable OSX amd64 build +if ( APPLE AND "amd64" STREQUAL "${DYNAMIPS_ARCH}" ) + add_definitions( "-DMAC64HACK" ) +endif() + + # dynamips_*_stable set ( _files "${COMMON}/mempool.c" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/stable/mips64_exec.c new/dynamips-0.2.15/stable/mips64_exec.c --- old/dynamips-0.2.14/stable/mips64_exec.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/stable/mips64_exec.c 2015-06-02 15:01:25.000000000 +0200 @@ -289,7 +289,7 @@ } /* Execute a memory operation */ -_unused static forced_inline void mips64_exec_memop(cpu_mips_t *cpu,int memop, +_Unused static forced_inline void mips64_exec_memop(cpu_mips_t *cpu,int memop, m_uint64_t vaddr,u_int dst_reg, int keep_ll_bit) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/stable/mips64_jit.c new/dynamips-0.2.15/stable/mips64_jit.c --- old/dynamips-0.2.14/stable/mips64_jit.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/stable/mips64_jit.c 2015-06-02 15:01:25.000000000 +0200 @@ -261,7 +261,7 @@ } /* Check if the specified MIPS instruction is a jump */ -_unused static struct mips64_insn_jump *insn_jump_find(mips_insn_t ins) +_Unused static struct mips64_insn_jump *insn_jump_find(mips_insn_t ins) { struct mips64_insn_jump *jump = NULL; int i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/stable/ppc32_exec.c new/dynamips-0.2.15/stable/ppc32_exec.c --- old/dynamips-0.2.14/stable/ppc32_exec.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/stable/ppc32_exec.c 2015-06-02 15:01:25.000000000 +0200 @@ -3325,7 +3325,7 @@ } /* SUBFCO - Subtract From with Overflow */ -_unused static fastcall int ppc32_exec_SUBFCO(cpu_ppc_t *cpu,ppc_insn_t insn) +_Unused static fastcall int ppc32_exec_SUBFCO(cpu_ppc_t *cpu,ppc_insn_t insn) { int rd = bits(insn,21,25); int ra = bits(insn,16,20); @@ -3343,7 +3343,7 @@ } /* SUBFCO. */ -_unused static fastcall int ppc32_exec_SUBFCO_dot(cpu_ppc_t *cpu,ppc_insn_t insn) +_Unused static fastcall int ppc32_exec_SUBFCO_dot(cpu_ppc_t *cpu,ppc_insn_t insn) { int rd = bits(insn,21,25); int ra = bits(insn,16,20); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/stable/ppc32_jit.c new/dynamips-0.2.15/stable/ppc32_jit.c --- old/dynamips-0.2.14/stable/ppc32_jit.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/stable/ppc32_jit.c 2015-06-02 15:01:25.000000000 +0200 @@ -253,7 +253,7 @@ #define DEBUG_HREG 0 /* Show register allocation status */ -_unused static void ppc32_jit_show_hreg_status(cpu_ppc_t *cpu) +_Unused static void ppc32_jit_show_hreg_status(cpu_ppc_t *cpu) { struct hreg_map *map; @@ -465,7 +465,7 @@ } /* Add end of JIT block */ -_unused static void ppc32_jit_tcb_add_end(ppc32_jit_tcb_t *b) +_Unused static void ppc32_jit_tcb_add_end(ppc32_jit_tcb_t *b) { ppc32_set_ia(&b->jit_ptr,b->start_ia+(b->ppc_trans_pos<<2)); ppc32_jit_tcb_push_epilog(&b->jit_ptr); @@ -757,7 +757,7 @@ } /* Dump JIT operations (debugging) */ -_unused static void ppc32_op_dump(cpu_gen_t *cpu,ppc32_jit_tcb_t *b) +_Unused static void ppc32_op_dump(cpu_gen_t *cpu,ppc32_jit_tcb_t *b) { m_uint32_t ia = b->start_ia; jit_op_t *op; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/stable/ppc32_vmtest.c new/dynamips-0.2.15/stable/ppc32_vmtest.c --- old/dynamips-0.2.14/stable/ppc32_vmtest.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/stable/ppc32_vmtest.c 2015-06-02 15:01:25.000000000 +0200 @@ -156,7 +156,7 @@ } /* Boot the RAW image */ -_unused static int ppc32_vmtest_boot_raw(vm_instance_t *vm) +_Unused static int ppc32_vmtest_boot_raw(vm_instance_t *vm) { cpu_ppc_t *cpu; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/stable/ppc32_x86_trans.c new/dynamips-0.2.15/stable/ppc32_x86_trans.c --- old/dynamips-0.2.14/stable/ppc32_x86_trans.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/stable/ppc32_x86_trans.c 2015-06-02 15:01:25.000000000 +0200 @@ -688,7 +688,7 @@ } /* Dump regs */ -_unused static void ppc32_emit_dump_regs(cpu_ppc_t *cpu,ppc32_jit_tcb_t *b) +_Unused static void ppc32_emit_dump_regs(cpu_ppc_t *cpu,ppc32_jit_tcb_t *b) { jit_op_t *iop; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/stable/vm.c new/dynamips-0.2.15/stable/vm.c --- old/dynamips-0.2.14/stable/vm.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/stable/vm.c 2015-06-02 15:01:25.000000000 +0200 @@ -112,7 +112,7 @@ } /* Rebuild the object list pointers */ -_unused static void vm_object_rebuild_list(vm_instance_t *vm) +_Unused static void vm_object_rebuild_list(vm_instance_t *vm) { vm_obj_t **obj; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/unstable/mips64_exec.c new/dynamips-0.2.15/unstable/mips64_exec.c --- old/dynamips-0.2.14/unstable/mips64_exec.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/unstable/mips64_exec.c 2015-06-02 15:01:25.000000000 +0200 @@ -289,7 +289,7 @@ } /* Execute a memory operation */ -_unused static forced_inline void mips64_exec_memop(cpu_mips_t *cpu,int memop, +_Unused static forced_inline void mips64_exec_memop(cpu_mips_t *cpu,int memop, m_uint64_t vaddr,u_int dst_reg, int keep_ll_bit) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/unstable/mips64_jit.c new/dynamips-0.2.15/unstable/mips64_jit.c --- old/dynamips-0.2.14/unstable/mips64_jit.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/unstable/mips64_jit.c 2015-06-02 15:01:25.000000000 +0200 @@ -137,7 +137,7 @@ } /* Check if the specified MIPS instruction is a jump */ -_unused static struct mips64_insn_jump *insn_jump_find(mips_insn_t ins) +_Unused static struct mips64_insn_jump *insn_jump_find(mips_insn_t ins) { struct mips64_insn_jump *jump = NULL; int i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/unstable/ppc32_exec.c new/dynamips-0.2.15/unstable/ppc32_exec.c --- old/dynamips-0.2.14/unstable/ppc32_exec.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/unstable/ppc32_exec.c 2015-06-02 15:01:25.000000000 +0200 @@ -3324,7 +3324,7 @@ } /* SUBFCO - Subtract From with Overflow */ -_unused static fastcall int ppc32_exec_SUBFCO(cpu_ppc_t *cpu,ppc_insn_t insn) +_Unused static fastcall int ppc32_exec_SUBFCO(cpu_ppc_t *cpu,ppc_insn_t insn) { int rd = bits(insn,21,25); int ra = bits(insn,16,20); @@ -3342,7 +3342,7 @@ } /* SUBFCO. */ -_unused static fastcall int ppc32_exec_SUBFCO_dot(cpu_ppc_t *cpu,ppc_insn_t insn) +_Unused static fastcall int ppc32_exec_SUBFCO_dot(cpu_ppc_t *cpu,ppc_insn_t insn) { int rd = bits(insn,21,25); int ra = bits(insn,16,20); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/unstable/ppc32_jit.c new/dynamips-0.2.15/unstable/ppc32_jit.c --- old/dynamips-0.2.14/unstable/ppc32_jit.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/unstable/ppc32_jit.c 2015-06-02 15:01:25.000000000 +0200 @@ -252,7 +252,7 @@ #define DEBUG_HREG 0 /* Show register allocation status */ -_unused static void ppc32_jit_show_hreg_status(cpu_ppc_t *cpu) +_Unused static void ppc32_jit_show_hreg_status(cpu_ppc_t *cpu) { struct hreg_map *map; @@ -464,7 +464,7 @@ } /* Add end of JIT block */ -_unused static void ppc32_jit_tcb_add_end(ppc32_jit_tcb_t *tcb) +_Unused static void ppc32_jit_tcb_add_end(ppc32_jit_tcb_t *tcb) { ppc32_set_ia(&tcb->jit_ptr,tcb->start_ia+(tcb->ppc_trans_pos<<2)); ppc32_jit_tcb_push_epilog(&tcb->jit_ptr); @@ -781,7 +781,7 @@ } /* Dump JIT operations (debugging) */ -_unused static void ppc32_op_dump(cpu_gen_t *cpu,ppc32_jit_tcb_t *tcb) +_Unused static void ppc32_op_dump(cpu_gen_t *cpu,ppc32_jit_tcb_t *tcb) { m_uint32_t ia = tcb->start_ia; jit_op_t *op; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/unstable/ppc32_vmtest.c new/dynamips-0.2.15/unstable/ppc32_vmtest.c --- old/dynamips-0.2.14/unstable/ppc32_vmtest.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/unstable/ppc32_vmtest.c 2015-06-02 15:01:25.000000000 +0200 @@ -151,7 +151,7 @@ } /* Boot the RAW image */ -_unused static int ppc32_vmtest_boot_raw(vm_instance_t *vm) +_Unused static int ppc32_vmtest_boot_raw(vm_instance_t *vm) { cpu_ppc_t *cpu; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/unstable/ppc32_x86_trans.c new/dynamips-0.2.15/unstable/ppc32_x86_trans.c --- old/dynamips-0.2.14/unstable/ppc32_x86_trans.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/unstable/ppc32_x86_trans.c 2015-06-02 15:01:25.000000000 +0200 @@ -655,7 +655,7 @@ } /* Dump regs */ -_unused static void ppc32_emit_dump_regs(cpu_ppc_t *cpu,ppc32_jit_tcb_t *b) +_Unused static void ppc32_emit_dump_regs(cpu_ppc_t *cpu,ppc32_jit_tcb_t *b) { jit_op_t *iop; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.14/unstable/vm.c new/dynamips-0.2.15/unstable/vm.c --- old/dynamips-0.2.14/unstable/vm.c 2014-09-23 20:59:26.000000000 +0200 +++ new/dynamips-0.2.15/unstable/vm.c 2015-06-02 15:01:25.000000000 +0200 @@ -113,7 +113,7 @@ } /* Rebuild the object list pointers */ -_unused static void vm_object_rebuild_list(vm_instance_t *vm) +_Unused static void vm_object_rebuild_list(vm_instance_t *vm) { vm_obj_t **obj;
