Commit 472bf3c3 authored by Eisenhauer, Greg's avatar Eisenhauer, Greg
Browse files

Merge branch 'upstream-dill' into DILLUpstream 

* upstream-dill:
  dill 2018-12-11 (ef602f4d)
parents 97a0ee04 34596a21

thirdparty/dill/dill/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -304,8 +304,9 @@ if (DILL_ENABLE_DISASSEMBLY) 
	message(FATAL_ERROR "libopcodes not found, You need to install binutils for disassembler support.")

    else()

	INCLUDE_DIRECTORIES(${BINUTILS_INCLUDE_DIR})

	set(HAVE_DIS_ASM_H true)

	LINK_DIRECTORIES(${BINUTILS_LIB_DIR})

	LIST(APPEND TARGET_DEP_LIBS ${BINUTILS_LIBRARIES})

	LIST(APPEND TARGET_DEP_LIBS opcodes bfd )

	set(DIS_LIBS ${TARGET_DEP_LIBS})

	set (NO_DISASSEMBLER FALSE)

    endif()

thirdparty/dill/dill/ppc64le.c

+4 −4
Original line number Diff line number Diff line
@@ -1553,24 +1553,24 @@ ppc64le_flush(void *base, void *limit) 
#ifdef __GNUC__

	/* flush every 8 bytes of preallocated insn stream. */

	while((char*)ptr < (char*) limit) {

	    ptr = (char *)ptr + 128;

	    asm volatile ("dcbst 0, %0" : /* */ : "r" (ptr));

	    ptr = (char *)ptr + 128;

	}

	asm volatile("sync");

	while((char*)ptr < (char*) limit) {

	    ptr = (char *)ptr + 128;

	    asm volatile ("icbi 0, %0" : /* */ : "r" (ptr));

	    ptr = (char *)ptr + 128;

	}

	asm volatile("isync");

#else

	while((char*)ptr < (char*) limit) {

	    ptr = (char *)ptr + 128;

	    asm("dcbst 0, %r0");

	    ptr = (char *)ptr + 128;

	}

	asm ("sync");

	while((char*)ptr < (char*) limit) {

	    ptr = (char *)ptr + 128;

	    asm("icbi 0, %r0");

	    ptr = (char *)ptr + 128;

	}

	asm ("isync");

#endif

thirdparty/dill/dill/ppc64le_rt.c

+4 −4
Original line number Diff line number Diff line
@@ -59,24 +59,24 @@ ppc64le_flush(void *base, void *limit) 
#ifdef __GNUC__

	/* flush every 8 bytes of preallocated insn stream. */

	while((char*)ptr < (char*) limit) {

	    ptr = (char *)ptr + 128;

	    asm volatile ("dcbst 0, %0" : /* */ : "r" (ptr));

	    ptr = (char *)ptr + 128;

	}

	asm volatile("sync");

	while((char*)ptr < (char*) limit) {

	    ptr = (char *)ptr + 128;

	    asm volatile ("icbi 0, %0" : /* */ : "r" (ptr));

	    ptr = (char *)ptr + 128;

	}

	asm volatile("isync");

#else

	while((char*)ptr < (char*) limit) {

	    ptr = (char *)ptr + 128;

	    asm("dcbst 0, %r0");

	    ptr = (char *)ptr + 128;

	}

	asm ("sync");

	while((char*)ptr < (char*) limit) {

	    ptr = (char *)ptr + 128;

	    asm("icbi 0, %r0");

	    ptr = (char *)ptr + 128;

	}

	asm ("isync");

#endif