[Simit-arm-cvs] simit-arm/simulator Makefile.am,1.6,1.7 armsim.cpp,1.8,1.9

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

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

Modified Files:
	Makefile.am armsim.cpp 
Log Message:
some configuration changes

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simit-arm/simit-arm/simulator/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	23 Aug 2005 19:47:52 -0000	1.6
--- Makefile.am	14 Sep 2005 17:10:06 -0000	1.7
***************
*** 26,30 ****
  		include_temp.hpp more_managers.hpp interface.hpp \
  		cache.h fetch_oper_dec.hpp mach_list.hpp \
! 		biu.h machines.hpp parms.h mcu.h \
  		fetch_oper_pat.hpp fetch_oper_tab.hpp  func.hpp  \
  		$(top_builddir)/emulator/syscall.cpp \
--- 26,30 ----
  		include_temp.hpp more_managers.hpp interface.hpp \
  		cache.h fetch_oper_dec.hpp mach_list.hpp \
! 		biu.h machines.hpp parms.h mcu.hpp \
  		fetch_oper_pat.hpp fetch_oper_tab.hpp  func.hpp  \
  		$(top_builddir)/emulator/syscall.cpp \

Index: armsim.cpp
===================================================================
RCS file: /cvsroot/simit-arm/simit-arm/simulator/armsim.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** armsim.cpp	23 Aug 2005 19:47:52 -0000	1.8
--- armsim.cpp	14 Sep 2005 17:10:06 -0000	1.9
***************
*** 180,185 ****
  	fprintf(fp, "Total cycles         : ");
  	dump_int64(cycle_count, fp);
  	fprintf(fp, "\nEquivalent time on 206.4MHz host: %.4f sec.\n",
! 		(double)cycle_count/206438400.0);
  
  #ifdef EMUMEM_HASH                                            
--- 180,187 ----
  	fprintf(fp, "Total cycles         : ");
  	dump_int64(cycle_count, fp);
+ 	fprintf(fp, "\nTotal system cycles  : ");
+ 	dump_int64(system_cycle_count, fp);
  	fprintf(fp, "\nEquivalent time on 206.4MHz host: %.4f sec.\n",
! 		(double)system_cycle_count/206438400.0);
  
  #ifdef EMUMEM_HASH                                            
***************
*** 192,195 ****
--- 194,202 ----
  		mem->get_page_count());
  #endif
+ 
+ 	if (!use_self_mem) {
+ 		biu->print_stats(fp);
+ 	}
+ 	
  }
  
***************
*** 236,239 ****
--- 243,248 ----
    if (c_count==0) {
  
+ 	c_count = c_div;
+ 
  	/** Activate all OSMs in order. */
  	for (work_it=work_list.begin(); work_it!=work_list.end();) {
***************
*** 282,286 ****
  	syscall_update();
  
- 	c_count = c_div;
    }
  
--- 291,294 ----
***************
*** 288,292 ****
    system_cycle_count++;
  
!   // memory operates at normal speed otherwise bus will be clogged
    imcu->update_on_clock();
    dmcu->update_on_clock();
--- 296,300 ----
    system_cycle_count++;
  
!   // memory operates at normal speed otherwise bus may be blocked
    imcu->update_on_clock();
    dmcu->update_on_clock();