From b48c1e51a2a2f319721eaf4a7f7bbee5c8a658bc Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Sun, 7 Oct 2018 11:35:43 +0200 Subject: [PATCH] fix spelling of "occurred" though the whole codebase --- yabause/ChangeLog | 4 ++-- yabause/src/c68k/gen68k.c | 4 ++-- yabause/src/qt/ui/UIDebugSCSP.cpp | 4 ++-- yabause/src/qt/ui/UIDebugVDP1.cpp | 2 +- yabause/src/qt/ui/UIDebugVDP2Viewer.cpp | 2 +- yabause/src/sh1-pseudo.txt | 4 ++-- yabause/src/sh7034.c | 2 +- yabause/src/tsunami/Tsunami.h | 2 +- yabause/src/yui.h | 16 ++++++++-------- yabauseut/src/smpc.c | 10 +++++----- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/yabause/ChangeLog b/yabause/ChangeLog index e5c945d9db..d59df7da0e 100644 --- a/yabause/ChangeLog +++ b/yabause/ChangeLog @@ -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. @@ -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: diff --git a/yabause/src/c68k/gen68k.c b/yabause/src/c68k/gen68k.c index 9f81549e95..2c23bda0ee 100644 --- a/yabause/src/c68k/gen68k.c +++ b/yabause/src/c68k/gen68k.c @@ -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"); @@ -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"); diff --git a/yabause/src/qt/ui/UIDebugSCSP.cpp b/yabause/src/qt/ui/UIDebugSCSP.cpp index 09f761c0c1..382d3d8389 100644 --- a/yabause/src/qt/ui/UIDebugSCSP.cpp +++ b/yabause/src/qt/ui/UIDebugSCSP.cpp @@ -197,7 +197,7 @@ 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 () @@ -205,5 +205,5 @@ 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." ) ); } diff --git a/yabause/src/qt/ui/UIDebugVDP1.cpp b/yabause/src/qt/ui/UIDebugVDP1.cpp index 5c06b7226c..b37ecbfb98 100644 --- a/yabause/src/qt/ui/UIDebugVDP1.cpp +++ b/yabause/src/qt/ui/UIDebugVDP1.cpp @@ -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." ) ); } diff --git a/yabause/src/qt/ui/UIDebugVDP2Viewer.cpp b/yabause/src/qt/ui/UIDebugVDP2Viewer.cpp index b97ac37cad..7a059ba63b 100644 --- a/yabause/src/qt/ui/UIDebugVDP2Viewer.cpp +++ b/yabause/src/qt/ui/UIDebugVDP2Viewer.cpp @@ -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." ) ); } diff --git a/yabause/src/sh1-pseudo.txt b/yabause/src/sh1-pseudo.txt index 951da71f90..6fec1d5b28 100644 --- a/yabause/src/sh1-pseudo.txt +++ b/yabause/src/sh1-pseudo.txt @@ -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; @@ -651,7 +651,7 @@ void loc_bcc4() [0x00000008] 0x00000000 */ - //no dma must have occured + //no dma must have occurred if (CHCR2 & 2) goto fail; diff --git a/yabause/src/sh7034.c b/yabause/src/sh7034.c index e984f89182..a54fa7e303 100644 --- a/yabause/src/sh7034.c +++ b/yabause/src/sh7034.c @@ -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) { diff --git a/yabause/src/tsunami/Tsunami.h b/yabause/src/tsunami/Tsunami.h index 9fad4374a2..1a1e0ba84b 100644 --- a/yabause/src/tsunami/Tsunami.h +++ b/yabause/src/tsunami/Tsunami.h @@ -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 diff --git a/yabause/src/yui.h b/yabause/src/yui.h index bd53b22dc4..3ccfdd2b86 100644 --- a/yabause/src/yui.h +++ b/yabause/src/yui.h @@ -43,7 +43,7 @@ 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. */ @@ -51,7 +51,7 @@ void YuiSwapBuffers(void); 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. */ @@ -103,7 +103,7 @@ 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) */ @@ -111,7 +111,7 @@ void YuiSwapBuffers(void); 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); @@ -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(); @@ -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(); diff --git a/yabauseut/src/smpc.c b/yabauseut/src/smpc.c index 921f461f64..6db3f321bf 100644 --- a/yabauseut/src/smpc.c +++ b/yabauseut/src/smpc.c @@ -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; @@ -159,7 +159,7 @@ void smpc_test_system_manager_handler() { set_result(RESULT_SYS_MAN); - system_manager_occured = 1; + system_manager_occurred = 1; } ////////////////////////////////////////////////////////////////////////////// @@ -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; @@ -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)) {