ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

emscripten: More rec-cpp progress 

It almost builds now, except emscripten randomly gives up and crashes. No one likes my code these days...
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2015-07-29 06:45:02 +02:00
parent 0153145950
commit d8ccc9d2e7
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/hw/sh4/dyna/driver.cpp
View File

@ -88,7 +88,9 @@ void recSh4_Run()
verify(rcb_noffs(&next_pc)==-184); verify(rcb_noffs(&next_pc)==-184);
ngen_mainloop(sh4_dyna_rcb); ngen_mainloop(sh4_dyna_rcb);
#if !defined(TARGET_BOUNDED_EXECUTION)
sh4_int_bCpuRun=false; sh4_int_bCpuRun=false;
#endif
} }
void emit_Write32(u32 data) void emit_Write32(u32 data)

6
core/rec-cpp/rec_cpp.cpp
View File

@ -52,7 +52,11 @@ void ngen_mainloop(void* v_cntx)
cycle_counter = 0; cycle_counter = 0;
for (;;) { #if !defined(TARGET_BOUNDED_EXECUTION)
do
#else
for (int i=0; i<10000; i++) {
#endif
cycle_counter = SH4_TIMESLICE; cycle_counter = SH4_TIMESLICE;
do { do {
DynarecCodeEntryPtr rcb = bm_GetCode(ctx->cntx.pc); DynarecCodeEntryPtr rcb = bm_GetCode(ctx->cntx.pc);

6
shell/emscripten/Makefile
View File

@ -2,8 +2,9 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
FOR_LINUX :=1 FOR_LINUX :=1
NOT_ARM := 1 NOT_ARM := 1
NO_REC := 1 #NO_REC := 1
#NO_REND := 1 #NO_REND := 1
CPP_REC := 1
NO_NIXPROF := 1 NO_NIXPROF := 1
RZDCY_SRC_DIR = ../../core RZDCY_SRC_DIR = ../../core
@ -24,6 +25,7 @@ ASFLAGS :=
LDFLAGS := -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common LDFLAGS := -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common
CXXONLYFLAGS := -std=c++11
CXXFLAGS := -O3 -D GLES -D RELEASE -c -D TARGET_EMSCRIPTEN -D TARGET_NO_REC -D TARGET_NO_NVMEM -D TARGET_NO_WEBUI -D TARGET_NO_THREADS -D TARGET_BOUNDED_EXECUTION -D TARGET_NO_EXCEPTIONS CXXFLAGS := -O3 -D GLES -D RELEASE -c -D TARGET_EMSCRIPTEN -D TARGET_NO_REC -D TARGET_NO_NVMEM -D TARGET_NO_WEBUI -D TARGET_NO_THREADS -D TARGET_BOUNDED_EXECUTION -D TARGET_NO_EXCEPTIONS
CXXFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing
CXXFLAGS += -ffast-math CXXFLAGS += -ffast-math
@ -51,7 +53,7 @@ $(EXECUTABLE): $(OBJECTS)
obj/%.build.obj : $(RZDCY_SRC_DIR)/%.cpp obj/%.build.obj : $(RZDCY_SRC_DIR)/%.cpp
mkdir -p $(dir $@) mkdir -p $(dir $@)
$(CXX) $(EXTRAFLAGS) $(INCS) $(CXXFLAGS) $< -o $@ $(CXX) $(EXTRAFLAGS) $(INCS) $(CXXFLAGS) $(CXXONLYFLAGS) $< -o $@
obj/%.build.obj : $(RZDCY_SRC_DIR)/%.c obj/%.build.obj : $(RZDCY_SRC_DIR)/%.c
mkdir -p $(dir $@) mkdir -p $(dir $@)