awlsim/awlcompiler/insntrans.py

@@ -24,8 +24,9 @@ from awlsim.common.compat import *
 
 from awlsim.common.cpuspecs import * #+cimport
 from awlsim.common.cpuconfig import *
+from awlsim.common.exceptions import *
+from awlsim.common.util import *
 
-from awlsim.core.util import *
 from awlsim.core.instructions.all_insns import * #+cimport
 from awlsim.core.instructions.types import * #+cimport
 

awlsim/awlcompiler/optrans.py

@@ -32,9 +32,10 @@ import re
 from awlsim.common.cpuspecs import * #+cimport
 from awlsim.common.cpuconfig import *
 from awlsim.common.datatypehelpers import * #+cimport
+from awlsim.common.exceptions import *
+from awlsim.common.util import *
 
 from awlsim.core.operators import * #+cimport
-from awlsim.core.util import *
 from awlsim.core.parameters import * #+cimport
 from awlsim.core.memory import * #+cimport
 from awlsim.core.offset import * #+cimport

awlsim/awlcompiler/tokenizer.py

@@ -23,7 +23,6 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 #from awlsim.common.cython_support cimport * #@cy
 from awlsim.common.compat import *
 
-import sys
 import re
 
 from awlsim.common.enumeration import *
@@ -31,11 +30,11 @@ from awlsim.common.project import *
 from awlsim.common.refmanager import *
 from awlsim.common.namevalidation import *
 from awlsim.common.sources import AwlSource
+from awlsim.common.exceptions import *
+from awlsim.common.util import *
 
-from awlsim.core.util import *
 from awlsim.core.datatypes import *
-from awlsim.core.memory import * #@nocy
-#from awlsim.core.memory cimport * #@cy
+from awlsim.core.memory import * #+cimport
 from awlsim.core.identifier import *
 
 

awlsim/awlcompiler/translator.py

@@ -25,10 +25,11 @@ from awlsim.common.compat import *
 
 from awlsim.common.cpuconfig import *
 from awlsim.common.datatypehelpers import * #+cimport
+from awlsim.common.exceptions import *
+from awlsim.common.util import *
 
 from awlsim.core.instructions.all_insns import * #+cimport
 from awlsim.core.datastructure import * #+cimport
-from awlsim.core.util import *
 from awlsim.core.offset import * #+cimport
 from awlsim.core.operatortypes import * #+cimport
 from awlsim.core.operators import * #+cimport

awlsim/core/__init__.py

@@ -4,4 +4,3 @@ from awlsim.common.compat import *
 from awlsim.core.main import *
 from awlsim.core.cpu import *
 from awlsim.core.hardware import *
-from awlsim.core.util import *

awlsim/core/blocks.py

@@ -27,6 +27,7 @@ from awlsim.common.refmanager import *
 from awlsim.common.blockinfo import *
 from awlsim.common.wordpacker import *
 from awlsim.common.exceptions import *
+from awlsim.common.util import *
 
 from awlsim.core.blockinterface import *
 from awlsim.core.labels import * #+cimport
@@ -34,7 +35,6 @@ from awlsim.core.datatypes import *
 from awlsim.core.memory import * #+cimport
 from awlsim.core.operatortypes import * #+cimport
 from awlsim.core.operators import * #+cimport
-from awlsim.core.util import *
 from awlsim.core.offset import * #+cimport
 from awlsim.core.lstack import * #+cimport
 

awlsim/core/callstack.py

@@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 from awlsim.common.compat import *
 
 from awlsim.common.exceptions import *
+from awlsim.common.util import *
 
 from awlsim.core.datatypes import *
 from awlsim.core.memory import * #+cimport
@@ -35,7 +36,6 @@ from awlsim.core.blockinterface import *
 from awlsim.core.datablocks import * #+cimport
 from awlsim.core.parameters import * #+cimport
 from awlsim.core.parenstack import * #+cimport
-from awlsim.core.util import *
 
 
 __all__ = [

awlsim/core/counters.py

@@ -2,7 +2,7 @@
 #
 # AWL simulator - counters
 #
-# Copyright 2012-2018 Michael Buesch <m@bues.ch>
+# Copyright 2012-2019 Michael Buesch <m@bues.ch>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,8 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 from awlsim.common.compat import *
 
 from awlsim.common.exceptions import *
-
-from awlsim.core.util import *
+from awlsim.common.util import *
 
 
 class Counter(object): #+cdef
@@ -65,13 +64,9 @@ class Counter(object): #+cdef
 #@cy	cdef uint16_t getValueBCD(self):
 #@cy		cdef uint16_t bcd
 
-		bcd = self.counter % 10				#@nocy
-		bcd |= ((self.counter // 10) % 10) << 4		#@nocy
-		bcd |= ((self.counter // 100) % 10) << 8	#@nocy
-
-#@cy		bcd = self.counter % 10u
-#@cy		bcd |= ((self.counter // 10u) % 10u) << 4u
-#@cy		bcd |= ((self.counter // 100u) % 10u) << 8u
+		bcd = self.counter % 10				#+suffix-u
+		bcd |= ((self.counter // 10) % 10) << 4		#+suffix-u
+		bcd |= ((self.counter // 100) % 10) << 8	#+suffix-u
 
 		return bcd
 

awlsim/core/cpu.py

@@ -61,7 +61,6 @@ from awlsim.core.callstack import * #+cimport
 from awlsim.core.lstack import * #+cimport
 from awlsim.core.offset import * #+cimport
 from awlsim.core.obtemp import * #+cimport
-from awlsim.core.util import *
 from awlsim.core.insnmeas import * #+cimport
 
 from awlsim.awlcompiler.tokenizer import *