Permalink
Browse files

new version 3.4.0

  • Loading branch information...
gdabah committed Dec 2, 2018
1 parent 290dcd4 commit 48e8941c4c952c8b44273c95b5d58b8faaf19139
Showing with 19 additions and 17 deletions.
  1. +1 −1 README.md
  2. +1 −1 include/distorm.h
  3. +9 −7 make/linux/Makefile
  4. BIN make/win32/resource.rc
  5. +7 −7 setup.py
  6. +1 −1 src/config.h
@@ -14,6 +14,6 @@ diStorm3 is licensed under BSD!
Installing diStorm3 -
Clone repo locally and then 'python setup.py install' or alternatively: 'python -m pip install distorm3'.

For Windows, use these pre-built installers in https://pypi.org/manage/project/distorm3/release/3.3.8/.
For Windows, use these pre-built installers in https://pypi.org/project/distorm3/#files.

RTFM, the wiki has plenty of info.
@@ -1,4 +1,4 @@
/* diStorm 3.3.3 */
/* diStorm 3.4.0 */

/*
distorm.h
@@ -2,7 +2,7 @@
# diStorm3 (Linux Port)
#

TARGET = libdistorm3.so
TARGET_BASE = libdistorm3.so
COBJS = ../../src/mnemonics.o ../../src/wstring.o ../../src/textdefs.o ../../src/prefix.o ../../src/operands.o ../../src/insts.o ../../src/instructions.o ../../src/distorm.o ../../src/decoder.o
CC = gcc
CFLAGS += -fPIC -O2 -Wall -DSUPPORT_64BIT_OFFSET -DDISTORM_STATIC
@@ -11,21 +11,23 @@ PREFIX = /usr/local
# The lib SONAME version:
LIB_S_VERSION = 3
# The lib real version:
LIB_R_VERSION = 3.3.8
LDFLAGS += -Wl,-soname,${TARGET}.${LIB_S_VERSION}
LIB_R_VERSION = 3.4.0
LDFLAGS += -Wl,-soname,${TARGET_BASE}.${LIB_S_VERSION}
DESTDIR =
TARGET_NAME = ${TARGET_BASE}.${LIB_R_VERSION}

all: clib

clean:
/bin/rm -rf ../../src/*.o ${TARGET} ../../distorm3.a ./../*.o
/bin/rm -rf ../../src/*.o ${TARGET_NAME} ../../distorm3.a ./../*.o

clib: ${COBJS}
${CC} ${CFLAGS} ${VERSION} ${COBJS} ${LDFLAGS} -o ${TARGET}
${CC} ${CFLAGS} ${VERSION} ${COBJS} ${LDFLAGS} -o ${TARGET_NAME}
ar rs ../../distorm3.a ${COBJS}

install: libdistorm3.so
install -D -s ${TARGET} ${DESTDIR}/${PREFIX}/lib/${TARGET}
install: ${TARGET_NAME}
install -D -s ${TARGET_NAME} ${DESTDIR}${PREFIX}/lib/${TARGET_NAME}
ln -sf ${DESTDIR}${PREFIX}/lib/${TARGET_NAME} ${DESTDIR}${PREFIX}/lib/${TARGET_BASE}
@echo "... running ldconfig might be smart ..."

.c.o:
BIN +0 Bytes (100%) make/win32/resource.rc
Binary file not shown.
@@ -233,17 +233,17 @@ def main():
package='distorm3',
sources=get_sources,
include_dirs=['src', 'include'],
extra_compile_args=['-arch', 'i386', '-arch', 'x86_64', '-O2',
'-Wall', '-fPIC', '-DSUPPORT_64BIT_OFFSET',
extra_compile_args=['-arch', 'i386', '-arch', 'x86_64', '-O2',
'-Wall', '-fPIC', '-DSUPPORT_64BIT_OFFSET',
'-DDISTORM_DYNAMIC']))]
elif 'cygwin' in system:
libraries = [(
'distorm3', dict(
package='distorm3',
sources=get_sources,
include_dirs=['src', 'include'],
extra_compile_args=['-fPIC', '-O2', '-Wall',
'-DSUPPORT_64BIT_OFFSET',
extra_compile_args=['-fPIC', '-O2', '-Wall',
'-DSUPPORT_64BIT_OFFSET',
'-DDISTORM_STATIC']))]
else:
libraries = [(
@@ -252,8 +252,8 @@ def main():
sources=get_sources,
include_dirs=['src', 'include'],
extra_link_args=['-Wl,-soname,libdistorm3.so.3'],
extra_compile_args=['-fPIC', '-O2', '-Wall',
'-DSUPPORT_64BIT_OFFSET',
extra_compile_args=['-fPIC', '-O2', '-Wall',
'-DSUPPORT_64BIT_OFFSET',
'-DDISTORM_STATIC']))]

options = {
@@ -272,7 +272,7 @@ def main():

# Metadata
'name' : 'distorm3',
'version' : '3.3.8',
'version' : '3.4.0',
'description' : 'The goal of diStorm3 is to decode x86/AMD64' \
' binary streams and return a structure that' \
' describes each instruction.',
@@ -13,7 +13,7 @@ This library is licensed under the BSD license. See the file COPYING.
#define CONFIG_H

/* diStorm version number. */
#define __DISTORMV__ 0x030308
#define __DISTORMV__ 0x030400

#include <string.h> /* memset, memcpy - can be easily self implemented for libc independency. */

0 comments on commit 48e8941

Please sign in to comment.