Skip to content
Permalink
Browse files
Merge branch 'sync-upstream'
  • Loading branch information
littleguy77 committed Feb 16, 2015
2 parents 752a611 + a61effe commit d4bf3d42b42921f9807ef632c16472b8ff156aa1
Show file tree
Hide file tree
Showing 50 changed files with 3,901 additions and 897 deletions.
@@ -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.

0 comments on commit d4bf3d4

Please sign in to comment.