[Simit-arm-cvs] simit-arm/simulator BIU.h,1.2.2.3,1.2.2.4 main.cpp,1.2.2.10,1.2.2.11 more_managers.cpp,1.2.2.9,1.2.2.10

[Wei Q. <wei...@us...>]

Update of /cvsroot/simit-arm/simit-arm/simulator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15297

Modified Files:
      Tag: sc_branch
	BIU.h main.cpp more_managers.cpp 
Log Message:
some miscelaneous changes

Index: more_managers.cpp
===================================================================
RCS file: /cvsroot/simit-arm/simit-arm/simulator/more_managers.cpp,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -C2 -d -r1.2.2.9 -r1.2.2.10
*** more_managers.cpp	20 Mar 2005 16:03:24 -0000	1.2.2.9
--- more_managers.cpp	8 Apr 2006 04:59:00 -0000	1.2.2.10
***************
*** 4,7 ****
--- 4,8 ----
  //#include "emu_device.hpp"
  #include "nwfpe.h"
+ #include <csignal>
  
  using namespace simulator;
***************
*** 281,285 ****
  								"for instruction 0x%08x : "
  								" more than 16 memory references.\n", iw);
! 					exit(1);
  					break;
  				case arm_simulator::CP_FLAG_EARLY_DONE:
--- 282,286 ----
  								"for instruction 0x%08x : "
  								" more than 16 memory references.\n", iw);
! 					raise(SIGINT);
  					break;
  				case arm_simulator::CP_FLAG_EARLY_DONE:
***************
*** 287,291 ****
  								"for instruction 0x%08x : "
  								"done signal earlier than expected.\n", iw);
! 					exit(1);
  					break;
  				case arm_simulator::CP_FLAG_TIME_OUT:
--- 288,292 ----
  								"for instruction 0x%08x : "
  								"done signal earlier than expected.\n", iw);
! 					raise(SIGINT);
  					break;
  				case arm_simulator::CP_FLAG_TIME_OUT:
***************
*** 293,297 ****
  								"for instruction 0x%08x : "
  								"time out.\n", iw);
! 					exit(1);
  					break;
  			}
--- 294,298 ----
  								"for instruction 0x%08x : "
  								"time out.\n", iw);
! 					raise(SIGINT);
  					break;
  			}

Index: main.cpp
===================================================================
RCS file: /cvsroot/simit-arm/simit-arm/simulator/main.cpp,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.11
diff -C2 -d -r1.2.2.10 -r1.2.2.11
*** main.cpp	27 Mar 2005 05:33:33 -0000	1.2.2.10
--- main.cpp	8 Apr 2006 04:59:00 -0000	1.2.2.11
***************
*** 71,75 ****
  		}	
  	}
! 	
  	/* emulator instance */
  	if(prog_name)
--- 71,75 ----
  		}	
  	}
! 
  	/* emulator instance */
  	if(prog_name)

Index: BIU.h
===================================================================
RCS file: /cvsroot/simit-arm/simit-arm/simulator/Attic/BIU.h,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** BIU.h	20 Feb 2005 08:14:22 -0000	1.2.2.3
--- BIU.h	8 Apr 2006 04:59:00 -0000	1.2.2.4
***************
*** 52,59 ****
  
  		// if acknowledge received, then turn off busy
! 		if (busy && inAck) {
! 			acked = true;
! 			busy = false;
! 		}
  
  		// statistics counting
--- 52,58 ----
  
  		// if acknowledge received, then turn off busy
! 		if (acked) busy = false;
! 
! 		acked = inAck;
  
  		// statistics counting