Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions yabause/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
window.
- Fixed a bug when adding raw cheat codes.
- Fixed bugs in vdp1 debugger.
- Fixed a bug where saving/loading a save state and an error occured would
- Fixed a bug where saving/loading a save state and an error occurred would
cause sound looping.
- Scroll bar in memory editor now works properly when you move the thumb
control.
Expand Down Expand Up @@ -584,7 +584,7 @@
bsd port:
- Added support for OpenBSD
linux port:
- Fixed the segfault that occured when opening the preferences dialog.
- Fixed the segfault that occurred when opening the preferences dialog.
- Added texture display in vdp1 debug dialog
- Other GUI improvements
macos port:
Expand Down
4 changes: 2 additions & 2 deletions yabause/src/c68k/gen68k.c
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,7 @@ static void GenDIVU()

wf_op("\t\tif (q & 0xFFFF0000)\n");
wf_op("\t\t{\n");
// overflow occured
// overflow occurred
wf_op("\t\t\tCPU->flag_V = C68K_SR_V;\n");
quick_terminate_op(70);
wf_op("\t\t}\n");
Expand Down Expand Up @@ -1926,7 +1926,7 @@ static void GenDIVS()

wf_op("\t\tif ((q > 0x7FFF) || (q < -0x8000))\n");
wf_op("\t\t{\n");
// overflow occured
// overflow occurred
wf_op("\t\t\tCPU->flag_V = C68K_SR_V;\n");
quick_terminate_op(80);
wf_op("\t\t}\n");
Expand Down
4 changes: 2 additions & 2 deletions yabause/src/qt/ui/UIDebugSCSP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,13 @@ void UIDebugSCSP::on_pbSaveAsWav_clicked ()
// write image if ok
if ( !s.isEmpty() )
if (ScspSlotDebugAudioSaveWav(sbSlotNumber->value(), s.toLatin1()) != 0)
CommonDialogs::information( QtYabause::translate( "An error occured while writing file." ) );
CommonDialogs::information( QtYabause::translate( "An error occurred while writing file." ) );
}

void UIDebugSCSP::on_pbSaveSlotRegisters_clicked ()
{
const QString s = CommonDialogs::getSaveFileName( QString(), QtYabause::translate( "Choose a location for your binary file" ), QtYabause::translate( "Binary Files (*.bin)" ) );
if ( !s.isEmpty() )
if (ScspSlotDebugSaveRegisters(sbSlotNumber->value(), s.toLatin1()) != 0)
CommonDialogs::information( QtYabause::translate( "An error occured while writing file." ) );
CommonDialogs::information( QtYabause::translate( "An error occurred while writing file." ) );
}
2 changes: 1 addition & 1 deletion yabause/src/qt/ui/UIDebugVDP1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,5 @@ void UIDebugVDP1::on_pbSaveBitmap_clicked ()
// write image if ok
if ( !s.isEmpty() )
if ( !img.save( s ) )
CommonDialogs::information( QtYabause::translate( "An error occured while writing file." ) );
CommonDialogs::information( QtYabause::translate( "An error occurred while writing file." ) );
}
2 changes: 1 addition & 1 deletion yabause/src/qt/ui/UIDebugVDP2Viewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,6 @@ void UIDebugVDP2Viewer::on_pbSaveAsBitmap_clicked ()
// write image if ok
if ( !s.isEmpty() )
if ( !img.save( s ) )
CommonDialogs::information( QtYabause::translate( "An error occured while writing file." ) );
CommonDialogs::information( QtYabause::translate( "An error occurred while writing file." ) );
}

4 changes: 2 additions & 2 deletions yabause/src/sh1-pseudo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ void loc_be7c()
r0 += 2;
}

//no dma should have occured thus far
//no dma should have occurred thus far
if (CHCR3 & 2)
goto fail;

Expand Down Expand Up @@ -651,7 +651,7 @@ void loc_bcc4()
[0x00000008] 0x00000000
*/

//no dma must have occured
//no dma must have occurred
if (CHCR2 & 2)
goto fail;

Expand Down
2 changes: 1 addition & 1 deletion yabause/src/sh7034.c
Original file line number Diff line number Diff line change
Expand Up @@ -5149,7 +5149,7 @@ int check_gr_range(u16 gr, u16 old_tcnt, u16 new_tcnt)
{
if (new_tcnt < old_tcnt)
{
//overflow occured
//overflow occurred

if (gr >= old_tcnt || gr <= new_tcnt)
{
Expand Down
2 changes: 1 addition & 1 deletion yabause/src/tsunami/Tsunami.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void TsunamiUpdateTimelineToRealtime(const char *timeline_name);
This sets the current value of a named entry in the timeline. The entry will have this
value only for the current time step and will be reset to 0 afterwards. This is useful
to indicate that a value exists only the current time step, i.e. perhaps a boolean
value indicating that an event occured on that particular timestep.
value indicating that an event occurred on that particular timestep.

TsunamiSetRange():
This creates a single value in the VCD file with value "_range_". It is useful as a presentation
Expand Down
16 changes: 8 additions & 8 deletions yabause/src/yui.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ void YuiSwapBuffers(void);
/* int MappedMemoryLoad(const char *filename, u32 addr);

Loads the specified file(filename) to specified address(addr). Returns zero
on success, less than zero if an error has occured.
on success, less than zero if an error has occurred.
Note: Some areas in memory are read-only and won't acknowledge any writes.
*/

/* int MappedMemorySave(const char *filename, u32 addr, u32 size);

Saves data from specified address(addr) by specified amount of bytes(size)
to specified file(filename). Returns zero on success, less than zero if
an error has occured.
an error has occurred.
Note: Some areas in memory are write-only and will only return zero on
reads.
*/
Expand Down Expand Up @@ -103,15 +103,15 @@ void YuiSwapBuffers(void);

For the specified SH2 context(context), it adds a code breakpoint for
specified address(addr). context should be either MSH2 or SSH2. Returns
zero on success, or less than zero if an error has occured(such as the
zero on success, or less than zero if an error has occurred(such as the
breakpoint list being full)
*/

/* int SH2DelCodeBreakpoint(SH2_struct *context, u32 addr);

For the specified SH2 context(context), it deletes a code breakpoint for
specified address(addr). context should be either MSH2 or SSH2. Returns
zero on success, or less than zero if an error has occured.
zero on success, or less than zero if an error has occurred.
*/

/* codebreakpoint_struct *SH2GetBreakpointList(SH2_struct *context);
Expand Down Expand Up @@ -157,14 +157,14 @@ void YuiSwapBuffers(void);
/* int M68KAddCodeBreakpoint(u32 addr);

It adds a 68K code breakpoint for specified address(addr). Returns zero on
success, or less than zero if an error has occured(such as the breakpoint
success, or less than zero if an error has occurred(such as the breakpoint
list being full)
*/

/* int M68KDelCodeBreakpoint(u32 addr);

It deletes a 68k code breakpoint for specified address(addr). Returns zero
on success, or less than zero if an error has occured.
on success, or less than zero if an error has occurred.
*/

/* m68kcodebreakpoint_struct *M68KGetBreakpointList();
Expand Down Expand Up @@ -206,14 +206,14 @@ void YuiSwapBuffers(void);
/* int ScuDspAddCodeBreakpoint(u32 addr);

It adds a SCU DSP code breakpoint for specified address(addr). Returns zero
on success, or less than zero if an error has occured(such as the
on success, or less than zero if an error has occurred(such as the
breakpoint list being full)
*/

/* int ScuDspDelCodeBreakpoint(u32 addr);

It deletes a SCU DSP code breakpoint for specified address(addr). Returns
zero on success, or less than zero if an error has occured.
zero on success, or less than zero if an error has occurred.
*/

/* scucodebreakpoint_struct *ScuDspGetBreakpointList();
Expand Down
10 changes: 5 additions & 5 deletions yabauseut/src/smpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ volatile int lines_since_vblank_out = 0;
volatile int lines_since_vblank_in = 0;

volatile int result_pos = 0;
volatile int system_manager_occured = 0;
volatile int system_manager_occurred = 0;

volatile int frame_count = 0;
volatile int stored_timer = 0;
Expand Down Expand Up @@ -159,7 +159,7 @@ void smpc_test_system_manager_handler()
{
set_result(RESULT_SYS_MAN);

system_manager_occured = 1;
system_manager_occurred = 1;
}

//////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -207,7 +207,7 @@ void reset_test_vars()
lines_since_vblank_in = 0;

result_pos = 0;
system_manager_occured = 0;
system_manager_occurred = 0;

frame_count = 0;
stored_timer = 0;
Expand Down Expand Up @@ -245,9 +245,9 @@ void smpc_intback_issue_timing_test_main(int test_type, int vblank_line)
smpc_issue_command(SMPC_CMD_INTBACK);
}

if (system_manager_occured)
if (system_manager_occurred)
{
system_manager_occured = 0;
system_manager_occurred = 0;

if (SMPC_REG_SR & (1 << 5))
{
Expand Down