Commit: a65ce4736e25a838697a1e7c0d6b4cb3da312656 - tme (git)

Commit MetaInfo

• Révision: a65ce4736e25a838697a1e7c0d6b4cb3da312656 (tree)
• l'heure: 2023-01-21 21:43:11
• Auteur: phabrics <phabrics@phab...>
• Commiter: phabrics

Message de Log

Fixed sun3 timer interrupt rate calculator.

Change Summary

• modified: ic/am9513.c
• modified: ic/isil7170.c
• modified: machine/sun/tme-make-machs

Modification

--- a/ic/am9513.c
+++ b/ic/am9513.c
@@ -475,10 +475,10 @@ _tme_am9513_th_timer(struct tme_am9513 *am9513)
 	  tme_log(TME_AM9513_LOG_HANDLE(am9513),
 		  0, TME_OK,
 		  (TME_AM9513_LOG_HANDLE(am9513),
-		   "timer %d interrupt rate: %ld/sec",
+		   "timer %d interrupt rate: %ld %ld/sec",
 		   counter_i,
-		   (TME_TIME_SET_SEC(counter->tme_am9513_counter_int_sample)
-		    / counter->tme_am9513_counter_int_sample_time)));
+		   counter->tme_am9513_counter_int_sample,
+		   TME_TIME_GET_SEC(counter->tme_am9513_counter_int_sample_time)));
 	}
 
 	/* reset the sample: */

--- a/ic/isil7170.c
+++ b/ic/isil7170.c
@@ -91,7 +91,7 @@ _TME_RCSID("$Id: isil7170.c,v 1.6 2010/06/05 14:37:27 fredette Exp $");
 /* define this to track interrupt rates, reporting once every N
    seconds: */
 #if 1
-#define TME_ISIL7170_TRACK_INT_RATE		(10)
+#define TME_ISIL7170_TRACK_INT_RATE		TME_TIME_SET_SEC(10)
 #endif
 
 #define TME_ISIL7170_LOG_HANDLE(am) (&(am)->tme_isil7170_element->tme_element_log_handle)
@@ -336,13 +336,13 @@ _tme_isil7170_th_timer(struct tme_isil7170 *isil7170)
 		  0, TME_OK,
 		  (TME_ISIL7170_LOG_HANDLE(isil7170),
 		   "timer interrupt rate: %ld/sec",
-		   (isil7170->tme_isil7170_int_sample
-		    / (TME_ISIL7170_TRACK_INT_RATE
-		       + TME_TIME_GET_SEC(now - isil7170->tme_isil7170_int_sample_time)))));
+		   (TME_TIME_SET_SEC(isil7170->tme_isil7170_int_sample)
+		    / (now - (isil7170->tme_isil7170_int_sample_time - TME_ISIL7170_TRACK_INT_RATE
+			      )))));
 	}
 
 	/* reset the sample: */
-        now += TME_TIME_GET_SEC(TME_ISIL7170_TRACK_INT_RATE);
+        now += TME_ISIL7170_TRACK_INT_RATE;
 	isil7170->tme_isil7170_int_sample_time = now;
 	isil7170->tme_isil7170_int_sample = 0;
       }

--- a/machine/sun/tme-make-machs
+++ b/machine/sun/tme-make-machs
@@ -32,6 +32,13 @@
 
 # Default values of various locations to download from/to. 
 
+# Machines to build in machine_root. Templates come from machine_dir and are
+# put in directories named after the template files. If unset, default template
+# directory is <tme_install_prefix>/share/tme/examples. 
+machine_root=./machine
+machine_dir=
+machines=
+
 # Firmware downloads for various machines
 firmware_root=./sun-fw
 firmware_site=https://people.csail.mit.edu/~fredette/tme