Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Wed, 3 May 2017 01:55:32 +0000 (03:55 +0200)
committertwinaphex <libretro@gmail.com>
Wed, 3 May 2017 01:55:32 +0000 (03:55 +0200)
1  2 
libpcsxcore/new_dynarec/arm/linkage_arm.S
libpcsxcore/new_dynarec/new_dynarec.c

@@@ -7119,15 -7068,14 +7119,15 @@@ void new_dynarec_init(void
      SysPrintf("mmap() failed: %s\n", strerror(errno));
      abort();
    }
 -  #endif
 +#endif
  #else
 -  #ifndef NO_WRITE_EXEC
 +#ifndef NO_WRITE_EXEC
    // not all systems allow execute in data segment by default
-   if (mprotect((void*)BASE_ADDR, 1<<TARGET_SIZE_2, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
+   if (mprotect((void *)BASE_ADDR, 1<<TARGET_SIZE_2, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
      SysPrintf("mprotect() failed: %s\n", strerror(errno));
 -  #endif
  #endif
 +#endif
 +
    out=(u_char *)BASE_ADDR;
    cycle_multiplier=200;
    new_dynarec_clear_full();