Compare commits
2 commits
014c10a6bd
...
b138240450
Author | SHA1 | Date | |
---|---|---|---|
|
b138240450 | ||
|
fe99044a96 |
4 changed files with 13 additions and 16 deletions
|
@ -280,8 +280,8 @@ static ChfAction EmulatorLoopHandler( const ChfDescriptor* d, const ChfState s,
|
|||
if ( ChfGetModuleId( d ) == CPU_CHF_MODULE_ID ) {
|
||||
/* Condition from CPU modules; check Condition Code */
|
||||
switch ( ChfGetConditionCode( d ) ) {
|
||||
#ifdef CPU_SPIN_SHUTDN
|
||||
case CPU_I_SHUTDN:
|
||||
#ifdef CPU_SPIN_SHUTDN
|
||||
/* CPU shutdown signalled with CPU_SPIN_SHUTDN defined;
|
||||
Fatal error.
|
||||
*/
|
||||
|
@ -289,9 +289,7 @@ static ChfAction EmulatorLoopHandler( const ChfDescriptor* d, const ChfState s,
|
|||
ChfSignal();
|
||||
|
||||
act = CHF_RESIGNAL;
|
||||
break;
|
||||
#else
|
||||
case CPU_I_SHUTDN:
|
||||
{
|
||||
/* 3.1: CPU_SPIN_SHUTDN is not defined, and the cpu emulator
|
||||
has just executed a shutdown instruction.
|
||||
|
@ -466,8 +464,8 @@ static ChfAction EmulatorLoopHandler( const ChfDescriptor* d, const ChfState s,
|
|||
|
||||
act = CHF_CONTINUE;
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
break;
|
||||
|
||||
case CPU_I_EMULATOR_INT:
|
||||
/* Emulator interrupt; unwind */
|
||||
|
@ -539,9 +537,9 @@ void Emulator( void )
|
|||
|
||||
/* Activate emulator loop */
|
||||
EmulatorLoop();
|
||||
} else {
|
||||
/* Unwinding after an emulator interrupt */
|
||||
}
|
||||
} /* else { */
|
||||
/* /\* Unwinding after an emulator interrupt *\/ */
|
||||
/* } */
|
||||
}
|
||||
|
||||
/* .+
|
||||
|
@ -640,7 +638,6 @@ void EmulatorInit( void )
|
|||
void EmulatorExit( enum ExitOption opt )
|
||||
{
|
||||
switch ( opt ) {
|
||||
|
||||
case SAVE_AND_EXIT:
|
||||
/* Save state of cpu and modules subsystems */
|
||||
ModSave();
|
||||
|
|
|
@ -147,11 +147,11 @@ typedef void ( *FsbContinuation )( int proceed, char* file_name );
|
|||
Function prototypes
|
||||
---------------------------------------------------------------------------*/
|
||||
|
||||
void HandleXEvents( void );
|
||||
void IdleXLoop( unsigned long max_wait );
|
||||
void HandleXEvents( void ); /* used in emulator.c */
|
||||
void IdleXLoop( unsigned long max_wait ); /* used in emulator.c */
|
||||
|
||||
void InitializeGui( int argc, char* argv[] );
|
||||
void InitializeGui( int argc, char* argv[] ); /* used in main.c */
|
||||
|
||||
void ActivateFSB( char* title, char* file_name, FsbContinuation continuation );
|
||||
void ActivateFSB( char* title, char* file_name, FsbContinuation continuation ); /* used in x_func.c */
|
||||
|
||||
#endif /*!_X11_H*/
|
||||
|
|
|
@ -87,9 +87,9 @@
|
|||
Function prototypes
|
||||
---------------------------------------------------------------------------*/
|
||||
|
||||
void InitLcd( Display* lcd_display, Window lcd_window, unsigned long lcd_fg_pixel, unsigned long lcd_bg_pixel );
|
||||
void InitLcd( Display* lcd_display, Window lcd_window, unsigned long lcd_fg_pixel, unsigned long lcd_bg_pixel ); /* used in x11.c */
|
||||
|
||||
void DrawLcd( void );
|
||||
void RefreshLcd( void );
|
||||
void DrawLcd( void ); /* used in emulator.c */
|
||||
void RefreshLcd( void ); /* used in x11.c */
|
||||
|
||||
#endif /*!_DISPLAY_H*/
|
||||
|
|
|
@ -108,6 +108,6 @@
|
|||
Function prototypes
|
||||
---------------------------------------------------------------------------*/
|
||||
|
||||
void ExtendedFunction( Nibble function_code );
|
||||
void ExtendedFunction( Nibble function_code ); /* used in hdw.c */
|
||||
|
||||
#endif /*!_X_FUNC_H*/
|
||||
|
|
Loading…
Reference in a new issue