Permalink
Browse files

Merge branch 'sync-upstream'

  • Loading branch information...
littleguy77 committed Feb 16, 2015
2 parents 752a611 + a61effe commit d4bf3d42b42921f9807ef632c16472b8ff156aa1
Showing with 3,901 additions and 897 deletions.
  1. +2 −0 jni/Android.mk
  2. +2 −2 jni/mupen64plus-core/doc/emuwiki-api-doc/Mupen64Plus-v2.0-Core-Debugger.mediawiki
  3. +6 −0 jni/mupen64plus-core/doc/emuwiki-api-doc/Mupen64Plus-v2.0-headers.mediawiki
  4. +675 −0 jni/mupen64plus-core/projects/msvc10/mupen64plus-core.vcxproj
  5. +730 −0 jni/mupen64plus-core/projects/msvc10/mupen64plus-core.vcxproj.filters
  6. +4 −0 jni/mupen64plus-core/projects/msvc11/mupen64plus-core.vcxproj
  7. +16 −0 jni/mupen64plus-core/projects/msvc8/mupen64plus-core.vcproj
  8. +17 −1 jni/mupen64plus-core/projects/unix/Makefile
  9. +129 −46 jni/mupen64plus-core/src/ai/ai_controller.c
  10. +16 −2 jni/mupen64plus-core/src/ai/ai_controller.h
  11. +3 −3 jni/mupen64plus-core/src/api/debugger.c
  12. +2 −2 jni/mupen64plus-core/src/api/m64p_debugger.h
  13. +6 −0 jni/mupen64plus-core/src/api/m64p_types.h
  14. +6 −8 jni/mupen64plus-core/src/debugger/dbg_breakpoints.c
  15. +8 −10 jni/mupen64plus-core/src/debugger/debugger.c
  16. +3 −3 jni/mupen64plus-core/src/debugger/debugger.h
  17. +11 −3 jni/mupen64plus-core/src/main/main.c
  18. +12 −6 jni/mupen64plus-core/src/main/savestates.c
  19. +55 −55 jni/mupen64plus-core/src/memory/memory.c
  20. +3 −3 jni/mupen64plus-core/src/memory/memory.h
  21. +4 −36 jni/mupen64plus-core/src/pi/pi_controller.c
  22. +62 −0 jni/mupen64plus-core/src/plugin/emulate_speaker_via_audio_plugin.c
  23. +30 −0 jni/mupen64plus-core/src/plugin/emulate_speaker_via_audio_plugin.h
  24. +4 −4 jni/mupen64plus-core/src/r4300/interpreter_cop0.def
  25. +52 −52 jni/mupen64plus-core/src/r4300/interpreter_r4300.def
  26. +2 −2 jni/mupen64plus-core/src/r4300/interpreter_special.def
  27. +1 −4 jni/mupen64plus-core/src/r4300/interupt.c
  28. +79 −92 jni/mupen64plus-core/src/r4300/new_dynarec/assem_arm.c
  29. +30 −18 jni/mupen64plus-core/src/r4300/new_dynarec/assem_x86.c
  30. +7 −0 jni/mupen64plus-core/src/r4300/new_dynarec/assem_x86.h
  31. +26 −26 jni/mupen64plus-core/src/r4300/new_dynarec/linkage_arm.S
  32. +8 −8 jni/mupen64plus-core/src/r4300/new_dynarec/linkage_x86.S
  33. +873 −0 jni/mupen64plus-core/src/r4300/new_dynarec/linkage_x86.asm
  34. +179 −126 jni/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c
  35. +6 −0 jni/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.h
  36. +629 −315 jni/mupen64plus-core/src/r4300/pure_interp.c
  37. +22 −33 jni/mupen64plus-core/src/r4300/recomp.c
  38. +0 −1 jni/mupen64plus-core/src/r4300/recomp.h
  39. +0 −7 jni/mupen64plus-core/src/r4300/reset.c
  40. +7 −7 jni/mupen64plus-core/src/r4300/x86/gr4300.c
  41. +7 −7 jni/mupen64plus-core/src/r4300/x86_64/gr4300.c
  42. +43 −0 jni/mupen64plus-core/src/ri/rdram_detection_hack.c
  43. +27 −0 jni/mupen64plus-core/src/ri/rdram_detection_hack.h
  44. +2 −2 jni/mupen64plus-core/src/vi/vi_controller.c
  45. +2 −2 jni/mupen64plus-core/tools/regtests/regression-video.py
  46. +59 −0 jni/mupen64plus-rsp-hle/src/alist.c
  47. +10 −0 jni/mupen64plus-rsp-hle/src/alist.h
  48. +17 −9 jni/mupen64plus-rsp-hle/src/alist_naudio.c
  49. +5 −0 jni/mupen64plus-rsp-hle/src/arithmetics.h
  50. +2 −2 jni/mupen64plus-video-glide64mk2/projects/unix/Makefile
View
@@ -104,6 +104,7 @@ LOCAL_SRC_FILES := \
$(SRCDIR)/plugin/dummy_rsp.c \
$(SRCDIR)/plugin/dummy_video.c \
$(SRCDIR)/plugin/emulate_game_controller_via_input_plugin.c \
$(SRCDIR)/plugin/emulate_speaker_via_audio_plugin.c \
$(SRCDIR)/plugin/get_time_using_C_localtime.c \
$(SRCDIR)/plugin/plugin.c \
$(SRCDIR)/plugin/rumble_via_input_plugin.c \
@@ -125,6 +126,7 @@ LOCAL_SRC_FILES := \
$(SRCDIR)/rdp/fb.c \
$(SRCDIR)/rdp/rdp_core.c \
$(SRCDIR)/ri/rdram.c \
$(SRCDIR)/ri/rdram_detection_hack.c \
$(SRCDIR)/ri/ri_controller.c \
$(SRCDIR)/rsp/rsp_core.c \
$(SRCDIR)/si/af_rtc.c \
@@ -38,10 +38,10 @@ Most libmupen64plus functions return an <tt>m64p_error</tt> return code, which i
<br />
{| border="1"
|Prototype
|'''<tt>m64p_error DebugSetRunState(int runstate)</tt>'''
|'''<tt>m64p_error DebugSetRunState(m64p_dbg_runstate runstate)</tt>'''
|-
|Input Parameters
|'''<tt>runstate</tt>''' 0 == pause, 1 == single instruction step, 2 == run
|'''<tt>runstate</tt>''' An <tt>m64p_dbg_runstate</tt> enumerated type specifying the debugging state of the emulator. <tt>M64P_DBG_RUNSTATE_RUNNING</tt> continues execution until a breakpoint is hit or a different state is chosen. <tt>M64P_DBG_RUNSTATE_STEPPING</tt> enters a single step running mode that sends callbacks as each step is performed. <tt>M64P_DBG_RUNSTATE_PAUSED</tt> pauses execution to allow manual stepping.
|-
|Requirements
|The Mupen64Plus library must be built with debugger support and must be initialized before calling this function.
@@ -191,6 +191,12 @@
M64P_DBG_CPU_NEXT_INTERRUPT
} m64p_dbg_state;
typedef enum {
M64P_DBG_RUNSTATE_PAUSED = 0,
M64P_DBG_RUNSTATE_STEPPING,
M64P_DBG_RUNSTATE_RUNNING
} m64p_dbg_runstate;
typedef enum {
M64P_DBG_MEM_TYPE = 1,
M64P_DBG_MEM_FLAGS,

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit d4bf3d4

Please sign in to comment.