V1.1.1 - May 26, 2020:

- Better clock synchronization to avoid simulation glitches in slower systems.
ARMCoderBR · May 26, 2020 · f32c8dd · f32c8dd
1 parent b664c3c
commit f32c8dd
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 50 deletions.
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
@@ -1,48 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
-
-    <configuration id="cdt.managedbuild.config.gnu.exe.debug.769796154" name="Debug">
-
-        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-
-            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-
-            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-
-            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-
-            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1370420024531137949" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-
-                <language-scope id="org.eclipse.cdt.core.gcc"/>
-
-                <language-scope id="org.eclipse.cdt.core.g++"/>
-
-            </provider>
-
-        </extension>
-
-    </configuration>
-
-    <configuration id="cdt.managedbuild.config.gnu.exe.release.391794649" name="Release">
-
-        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-
-            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-
-            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-
-            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-
-            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1370420024531137949" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-
-                <language-scope id="org.eclipse.cdt.core.gcc"/>
-
-                <language-scope id="org.eclipse.cdt.core.g++"/>
-
-            </provider>
-
-        </extension>
-
-    </configuration>
-
+	<configuration id="cdt.managedbuild.config.gnu.exe.debug.769796154" name="Debug">
+		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-569688907015518406" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+				<language-scope id="org.eclipse.cdt.core.gcc"/>
+				<language-scope id="org.eclipse.cdt.core.g++"/>
+			</provider>
+		</extension>
+	</configuration>
+	<configuration id="cdt.managedbuild.config.gnu.exe.release.391794649" name="Release">
+		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-569688907015518406" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+				<language-scope id="org.eclipse.cdt.core.gcc"/>
+				<language-scope id="org.eclipse.cdt.core.g++"/>
+			</provider>
+		</extension>
+	</configuration>
 </project>
diff --git a/README.TXT b/README.TXT
@@ -7,8 +7,8 @@
 // SEE LICENSE AT https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 ////////////////////////////////////////////////////////////////////////////////
 
-    Version 1.1.0
-    May 23, 2020
+    Version 1.1.1
+    May 26, 2020
 
     INTRO
     ~~~~~
@@ -204,3 +204,8 @@ hinted within brackets.
       the user wants, and it will work as long as it is compatible with the 
       Ben's computer architecture!
 
+    V1.1.1 - May 26, 2020:
+
+    - Better clock synchronization to avoid simulation glitches in slower 
+      systems.
+
diff --git a/src/board.c b/src/board.c
@@ -1197,6 +1197,9 @@ int board_run(board_ctx_t *ctx, event_context_t *ec, board_object *board){
 
     refresh_thread_stop(ctx);
 
+    if (!ctx->clock_pausing)
+    	clock_pause(ctx);
+
     pthread_mutex_destroy(&ctx->setrefmutex);
 
     endwin();

diff --git a/src/computer/clkgen.c b/src/computer/clkgen.c
@@ -63,6 +63,7 @@ void *clkgen_thread(void *args){
         e.valueptr = &s->valuen;
         e.timestamp = 0;
         event_insert(s->ec, &e);
+        while (event_process(s->ec));
         event_mutex_unlock(s->ec);
 
         if (!s->pause)
@@ -124,7 +125,12 @@ void clkgen_destroy (clkgen **dest){
     ehandler_destroy(&b->outn_event_handler_root);
     vallist_destroy(&b->halt_rootptr);
 
+    event_mutex_lock(b->ec);
+    while (event_process(b->ec));
+    event_mutex_unlock(b->ec);
+
     free(b);
+
     *dest = NULL;
 }
 

diff --git a/src/computer/computer.c b/src/computer/computer.c
@@ -259,6 +259,8 @@ void computer_sim(){
 
     logger_end(ec);
 
+    DESTROY(mainclk);
+
     ////////////////
 
     DESTROY(regA);

diff --git a/src/computer/reg_out.c b/src/computer/reg_out.c
@@ -183,6 +183,8 @@ void reg_out_destroy (reg_out **dest){
     reg_out *b = *dest;
     if (b == NULL) return;
 
+    clkgen_destroy(&b->clk);
+
     ls173_destroy(&b->ls173_hi);
     ls173_destroy(&b->ls173_lo);
     indicator_destroy(&b->ledclk);
@@ -196,7 +198,6 @@ void reg_out_destroy (reg_out **dest){
     for (i = 0; i < 4; i++)
         dis7seg_destroy(&b->display[i]);
 
-    clkgen_destroy(&b->clk);
     indicator_destroy(&b->ledclki);
 
     ls76_destroy(&b->ls76);
@@ -206,7 +207,6 @@ void reg_out_destroy (reg_out **dest){
     ls139_destroy(&b->ls139);
     bitswitch_destroy(&b->sw_signed);
 
-
     free(b);
     *dest = NULL;
 }

diff --git a/src/update.h b/src/update.h
@@ -91,6 +91,6 @@ void part_destroy(void **part);
 
 #define SW_VERSION  1
 #define SW_REVISION 1
-#define SW_MINOR    0
+#define SW_MINOR    1
 
 #endif /* UPDATE_H_ */