add java8 support; port to macosx

bin/disl.py

@@ -332,7 +332,7 @@ def parse_arguments(parser):
 	if args.s_port is not None:
 		args.s_opts+= ["-Ddislserver.port="+args.s_port]
 	if args.s_noexcepthandler is True:
-		args.s_opts+= ["-Ddisl.noexcepthandler"]
+		args.s_opts+= ["-Ddisl.noexcepthandler=true"]
 	if args.s_exclusionlist is not None:
 		args.s_opts+= ["-Ddisl.exclusionList="+args.s_exclusionlist]
 	if args.s_instrumented is not None:

build.properties

 lib.dir=lib
 
-asm.lib=asm-debug-all-4.1.jar
+asm.lib=asm-debug-all-5.0.2.jar
 asm.path=${lib.dir}/${asm.lib}
 
 junit.core.lib=junit-4.11.jar

build.xml

@@ -680,7 +680,7 @@
 
 	<target name="eclipse" depends="package-eclipse-agent,package-disl-bypass" description="Creates libraries required for DiSL development under Eclipse." />
 
-	<target name="build" depends="compile,package,build-doc,build-jdoc" description="Packages DiSL and Shadow VM for distribution, including documentation." />
+	<target name="build" depends="compile,package,build-jdoc" description="Packages DiSL and Shadow VM for distribution, including documentation." />
 
 	<target name="release" depends="release-bin,release-src" description="Builds DiSL source and binary release archives." />
 

src-disl-agent/Makefile

@@ -101,7 +101,7 @@ all: $(LIBRARY)
 # Build native library
 ifneq (,$(WHOLE))
 
-CFLAGS += -DWHOLE -fwhole-program -flto
+CFLAGS += -DWHOLE -flto
 
 $(LIBRARY): $(HEADERS) $(SOURCES)
 	$(CC) $(CFLAGS) $(TARGET_ARCH) $(CFLAGS_LD) $(SOURCES) $(LIBS) $(OUTPUT_OPTION)

src-disl-agent/bin2cdef

@@ -16,7 +16,7 @@ while [ $# -gt 1 ]; do
 
 
 jvmtiClassDefinition ${NAME}_classdef = {
-	.class_byte_count = $(stat --format '%s' ${FILE}),
+	.class_byte_count = $(ls -l ${FILE} | awk '{print $5}'),
 	.class_bytes = (unsigned char *)
 $(hexdump -e '"\t\t" "Q" 16/1 "xxx%02x" "Q" "\n"' ${FILE} |sed 's/xxx  //g; y/Q/"/; s/xxx/\\x/g'),
 };