correct old labels

Author: heinrichdiebel

tb/simstm/Array/array_labs.stm

@@ -1,12 +1,11 @@
 array array_name_pos 3
 var var_name_pos 0
 
-testArrayGetOutPos:
-proc
+proc testArrayGetOutPos ()
     array get array_name_pos 3 var_name_pos
 end proc
 
-testArraySetOutPos:
-proc
+
+proc testArraySetOutPos ()
     array set array_name_pos 3 var_name_pos
 end proc

tb/simstm/Array/array_labs_zero_size.stm

@@ -1,8 +1,8 @@
 array array_name_zsz 0
 var var_name_zsz 10
 
-testArrayZeroSize:
-proc
+
+proc testArrayZeroSize ()
     call startStandardTestShell ()
 
     array size array_name_zsz var_name_zsz

tb/simstm/TestLabs/TestLabArrayGetOutPos.stm

@@ -1,5 +1,5 @@
 
 proc testLabArrayGetOutPos ()
 
-    call testArrayGetOutPos
+    call testArrayGetOutPos ()
 end proc

tb/simstm/TestLabs/TestLabArraySetOutPos.stm

@@ -1,4 +1,4 @@
 
 proc testLabArraySetOutPos ()
-    call testArraySetOutPos
+    call testArraySetOutPos ()
 end proc

tb/simstm/TestLabs/TestLabArrayZeroSize.stm

@@ -1,5 +1,5 @@
 
 proc testLabArrayZeroSize ()
 
-    call testArrayZeroSize
+    call testArrayZeroSize ()
 end proc

tb/simstm/TestSuites/TestSuiteArray.stm

@@ -3,7 +3,7 @@ proc testSuiteArray ()
 
     label lblTestArray testArray
     call testCase (
-    	label pointer copy TestToCall lblTestArray
+    	label equ TestToCall lblTestArray
     )
 
     label lblTestCaseArrayGet testArrayGet

tb/simstm/TestSuites/TestSuiteVariable.stm

@@ -92,7 +92,7 @@ proc testCaseVariableLd (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableLd
+    call testVariableLd ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -104,7 +104,7 @@ proc testCaseVariableInv (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableInv
+    call testVariableInv ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -116,7 +116,7 @@ proc testCaseVariableXor (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableXor
+    call testVariableXor ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -128,7 +128,7 @@ proc testCaseVariableSub (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableSub
+    call testVariableSub ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -140,7 +140,7 @@ proc testCaseVariableOr (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableOr
+    call testVariableOr ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -152,7 +152,7 @@ proc testCaseVariableMul (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableMul
+    call testVariableMul ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -164,7 +164,7 @@ proc testCaseVariableEqu (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableEqu
+    call testVariableEqu ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -176,7 +176,7 @@ proc testCaseVariableDiv (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableDiv
+    call testVariableDiv ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -188,7 +188,7 @@ proc testCaseVariableAnd (
 	var skipped 0
 )
     call beginTestCase ()    
-    call testVariableAnd
+    call testVariableAnd ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure
@@ -200,7 +200,7 @@ proc testCaseVariableAdd (
 	var skipped 0
 )
     call beginTestCase ()
-    call testVariableAdd
+    call testVariableAdd ()
     call endTestCase ( 
     	equ  skipped skipped
     	equ failure StandardTestFailure

tb/simstm/Variable/variable.stm

@@ -1,8 +1,7 @@
 var test_variable_add_1 1
 var test_variable_add_2 2
 
-testVariableAdd:
-proc
+proc testVariableAdd ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {:d}" test_variable_add_1
@@ -31,8 +30,7 @@ end proc
 var test_variable_and_1 0xAAAA
 var test_variable_and_2 0x77777777
 
-testVariableAnd:
-proc
+proc testVariableAnd ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {:x}" test_variable_and_1
@@ -61,8 +59,7 @@ end proc
 var test_variable_div_1 500
 var test_variable_div_2 5000
 
-testVariableDiv:
-proc
+proc testVariableDiv ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {:d}" test_variable_div_1
@@ -94,8 +91,7 @@ var test_variable_equ_3 3
 var test_variable_equ_4 4
 var test_variable_equ_5 5
 
-testVariableEqu:
-proc
+proc testVariableEqu ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {:d}" test_variable_equ_1
@@ -144,8 +140,7 @@ end proc
 var test_variable_mul_1 1
 var test_variable_mul_2 2
 
-testVariableMul:
-proc
+proc testVariableMul ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {:d}" test_variable_mul_1
@@ -175,8 +170,7 @@ end proc
 var test_variable_or_1 0x1234
 var test_variable_or_2 0x80000000
 
-testVariableOr:
-proc
+proc testVariableOr ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {}" test_variable_or_1
@@ -205,8 +199,7 @@ end proc
 var test_variable_sub_1 12345
 var test_variable_sub_2 88
 
-testVariableSub:
-proc
+proc testVariableSub ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {:d}" test_variable_sub_1
@@ -235,8 +228,7 @@ end proc
 var test_variable_xor_1 0xFFFFFFFF
 var test_variable_xor_2 0x00000000
 
-testVariableXor:
-proc
+proc testVariableXor ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {}" test_variable_xor_1
@@ -265,8 +257,7 @@ end proc
 var test_variable_inv_1 0x12345678
 var test_variable_inv_2 0x0FEDCBA9
 
-testVariableInv:
-proc
+proc testVariableInv ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {}" test_variable_inv_1
@@ -296,8 +287,7 @@ end proc
 var test_variable_ld_1 0x1000
 var test_variable_ld_2 0x80000000
 
-testVariableLd:
-proc
+proc testVariableLd ()
     call startStandardTestShell ()
 
     log message 0 "test_variable_1: {}" test_variable_ld_1

tb/simstm/testMain.stm

@@ -51,8 +51,8 @@ include "Label/label.stm"
 lines success_lines
 file simulation_success "simulation.success"
 
-testMain:
-proc
+
+proc testMain ()
     call initBase ()
 
     verbosity INFO_2

tb/simstm/testMainSuiteFile.stm

@@ -9,8 +9,7 @@ include "File/file_local.stm"
 include "File/file_parameter.stm"
 include "File/file_pointer.stm"
 
-testMainSuiteFile:
-proc
+proc testMainSuiteFile ()
     call initBase ()
 
     verbosity INFO_2