Fixed tests for running on MacOs Sonoma

This commit is contained in:
Jesper Gravgaard 2023-11-25 16:22:11 +01:00
parent ff29404f24
commit cf13f35eed
34 changed files with 59 additions and 45 deletions

View File

@ -89,7 +89,7 @@
<dependency>
<groupId>se.triad.kickass</groupId>
<artifactId>kickass-cruncher-plugins</artifactId>
<version>2.0</version>
<version>2.1</version>
</dependency>
</dependencies>

View File

@ -0,0 +1,4 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Sat Nov 25 16:08:22 CET 2023
kickass-cruncher-plugins-2.1.jar>=
kickass-cruncher-plugins-2.1.pom>=

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>se.triad.kickass</groupId>
<artifactId>kickass-cruncher-plugins</artifactId>
<version>2.1</version>
<description>POM was created from install:install-file</description>
</project>

View File

@ -3,10 +3,11 @@
<groupId>se.triad.kickass</groupId>
<artifactId>kickass-cruncher-plugins</artifactId>
<versioning>
<release>2.0</release>
<release>2.1</release>
<versions>
<version>2.0</version>
<version>2.1</version>
</versions>
<lastUpdated>20201230180211</lastUpdated>
<lastUpdated>20231125150820</lastUpdated>
</versioning>
</metadata>

View File

@ -3,7 +3,7 @@
# Prepare by making the "official" metadata local
cp ./repo/se/triad/kickass/kickass-cruncher-plugins/maven-metadata.xml ./repo/se/triad/kickass/kickass-cruncher-plugins/maven-metadata-local.xml
mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/cruncher-plugins/releases/kickass-cruncher-plugins-2.0/kickass-cruncher-plugins-2.0.jar -DgroupId=se.triad.kickass -DartifactId=kickass-cruncher-plugins -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=2.0
mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/Downloads/kickass-cruncher-plugins-2.1.jar -DgroupId=se.triad.kickass -DartifactId=kickass-cruncher-plugins -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=2.1
# Finalize by making the local metadata official
pushd ./repo/se/triad/kickass/kickass-cruncher-plugins/

View File

@ -79,9 +79,9 @@ Successful SSA optimization Pass2ConstantIdentification
Inlining constant with different constant siblings main::bscreen#0
Inlining constant with different constant siblings main::bscreen#1
Inlining constant with different constant siblings main::bscreen#2
Constant inlined main::bscreen#2 = ++(bool *) 1024+2
Constant inlined main::bscreen#0 = (bool *) 1024
Constant inlined main::bscreen#1 = (bool *) 1024+2
Constant inlined main::bscreen#2 = ++(bool *) 1024+2
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *((bool *) 1024+1)
Successful SSA optimization Pass2ConstantAdditionElimination

View File

@ -127,9 +127,9 @@ Successful SSA optimization Pass2ConstantRValueConsolidation
Constant main::midw#0 = main::$7+1
Constant main::midb#0 = main::$4+1
Successful SSA optimization Pass2ConstantIdentification
Constant inlined main::$4 = main::sumb#0>>1
Constant inlined main::$1 = main::sumw#0>>1
Constant inlined main::$7 = (char)main::sumw#0>>1
Constant inlined main::$4 = main::sumb#0>>1
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(main::SCREEN+1)
Consolidated array index constant in *(main::SCREEN+1)

View File

@ -89,9 +89,9 @@ Successful SSA optimization Pass2ConstantIdentification
Inlining constant with different constant siblings idx#11
Inlining constant with different constant siblings idx#0
Inlining constant with different constant siblings idx#1
Constant inlined idx#11 = 0
Constant inlined idx#0 = ++0
Constant inlined idx#1 = ++++0
Constant inlined idx#11 = 0
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(SCREEN+++0)
Consolidated array index constant in *(SCREEN+++++0)

View File

@ -8145,7 +8145,7 @@ void random(char k , char n)
char random::$3 // 5.5E17
char random::k
char random::k#0 // 500.5
char random::k#4 // 2.00000000000000192E17
char random::k#4 // 2.000000000000002E17
char random::n
char random::n#0 // 2002.0
char random::n#4 // 2.00000000000002E16
@ -13650,7 +13650,7 @@ void random(char k , char n)
char random::$3 // zp[1]:2 5.5E17
char random::k
char random::k#0 // k zp[1]:3 500.5
char random::k#4 // k zp[1]:3 2.00000000000000192E17
char random::k#4 // k zp[1]:3 2.000000000000002E17
char random::n
char random::n#0 // n zp[1]:8 2002.0
char random::n#4 // n zp[1]:8 2.00000000000002E16

View File

@ -258,7 +258,7 @@ void random(char k , char n)
char random::$3 // zp[1]:2 5.5E17
char random::k
char random::k#0 // k zp[1]:3 500.5
char random::k#4 // k zp[1]:3 2.00000000000000192E17
char random::k#4 // k zp[1]:3 2.000000000000002E17
char random::n
char random::n#0 // n zp[1]:8 2002.0
char random::n#4 // n zp[1]:8 2.00000000000002E16

View File

@ -287,7 +287,6 @@ Inlining constant with different constant siblings idx#0
Inlining constant with different constant siblings idx#1
Inlining constant with different constant siblings idx#11
Constant inlined idx#11 = ++++++0
Constant inlined idx#16 = 0
Constant inlined euclid::b#0 = 2
Constant inlined euclid::a#1 = $a9
Constant inlined euclid::a#0 = $80
@ -297,6 +296,7 @@ Constant inlined idx#0 = ++0
Constant inlined euclid::b#1 = $45
Constant inlined euclid::a#2 = $ff
Constant inlined idx#1 = ++++0
Constant inlined idx#16 = 0
Constant inlined euclid::b#3 = 3
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(SCREEN+++0)

View File

@ -167,8 +167,8 @@ Inlining constant with var siblings main::i#0
Inlining constant with var siblings loop::i#0
Inlining constant with var siblings zpLoop::i#0
Constant inlined main::i#0 = 0
Constant inlined loop::i#0 = 0
Constant inlined zpLoop::i#0 = 0
Constant inlined loop::i#0 = 0
Successful SSA optimization Pass2ConstantInlining
Added new block during phi lifting loop::@2(between loop::@1 and loop::@1)
Added new block during phi lifting zpLoop::@2(between zpLoop::@1 and zpLoop::@1)

View File

@ -123,9 +123,9 @@ Successful SSA optimization PassNFinalizeNumberTypeConversions
Inlining constant with var siblings main::k#0
Inlining constant with var siblings main::l#0
Inlining constant with var siblings main::m#0
Constant inlined main::k#0 = 0
Constant inlined main::m#0 = 0
Constant inlined main::l#0 = 0
Constant inlined main::k#0 = 0
Successful SSA optimization Pass2ConstantInlining
Added new block during phi lifting main::@6(between main::@5 and main::@1)
Added new block during phi lifting main::@7(between main::@4 and main::@2)

View File

@ -109,8 +109,8 @@ Inlining constant with var siblings main::j#0
Inlining constant with var siblings main::i#0
Inlining constant with var siblings main::j#2
Constant inlined main::i#0 = 0
Constant inlined main::j#0 = 0
Constant inlined main::j#2 = 0
Constant inlined main::j#0 = 0
Successful SSA optimization Pass2ConstantInlining
Added new block during phi lifting main::@4(between main::@2 and main::@1)
Added new block during phi lifting main::@5(between main::@1 and main::@2)

View File

@ -110,8 +110,8 @@ Inlining constant with var siblings main::j#0
Inlining constant with var siblings main::i#0
Inlining constant with var siblings main::j#2
Constant inlined main::i#0 = 0
Constant inlined main::j#0 = 0
Constant inlined main::j#2 = 0
Constant inlined main::j#0 = 0
Successful SSA optimization Pass2ConstantInlining
Added new block during phi lifting main::@4(between main::@2 and main::@1)
Added new block during phi lifting main::@5(between main::@1 and main::@2)

View File

@ -196,8 +196,8 @@ Inlining constant with var siblings main::i#0
Inlining constant with var siblings main::j#0
Inlining constant with var siblings idx#13
Constant inlined main::i#0 = 0
Constant inlined main::j#0 = 0
Constant inlined idx#13 = 0
Constant inlined main::j#0 = 0
Successful SSA optimization Pass2ConstantInlining
Adding NOP phi() at start of main
CALL GRAPH

View File

@ -165,10 +165,10 @@ Inlining constant with var siblings sum::a#1
Inlining constant with var siblings sum::b#1
Inlining constant with different constant siblings idx#12
Inlining constant with different constant siblings idx#0
Constant inlined idx#12 = 0
Constant inlined sum::b#1 = 4
Constant inlined sum::b#0 = 2
Constant inlined sum::a#1 = 3
Constant inlined idx#12 = 0
Constant inlined idx#0 = ++0
Constant inlined sum::a#0 = 1
Successful SSA optimization Pass2ConstantInlining

View File

@ -476,8 +476,6 @@ Inlining constant with var siblings sub_irq::j#0
Inlining constant with var siblings sub_irq::k#0
Constant inlined sub_main::j#0 = 0
Constant inlined sub_main::i#0 = 0
Constant inlined irq::i#0 = 0
Constant inlined irq::j#0 = 0
Constant inlined irq::k#0 = 0
Constant inlined sub_irq::i#0 = 0
Constant inlined sub_irq::j#0 = 0
@ -485,6 +483,8 @@ Constant inlined sub_irq::k#0 = 0
Constant inlined main::i#0 = 0
Constant inlined main::k#0 = 0
Constant inlined main::j#0 = 0
Constant inlined irq::i#0 = 0
Constant inlined irq::j#0 = 0
Constant inlined sub_main::k#0 = 0
Successful SSA optimization Pass2ConstantInlining
Added new block during phi lifting main::@9(between main::@7 and main::@3)

View File

@ -199,8 +199,8 @@ Successful SSA optimization PassNEliminateEmptyStart
Inlining constant with var siblings mul16u::res#0
Inlining constant with var siblings mul16u::a#1
Inlining constant with var siblings mul16u::mb#0
Constant inlined mul16u::mb#0 = (unsigned long)mul16u::b#0
Constant inlined mul16u::res#0 = 0
Constant inlined mul16u::mb#0 = (unsigned long)mul16u::b#0
Constant inlined mul16u::a#1 = 4
Successful SSA optimization Pass2ConstantInlining
Added new block during phi lifting mul16u::@6(between mul16u::@2 and mul16u::@4)

View File

@ -140,9 +140,9 @@ Successful SSA optimization PassNFinalizeNumberTypeConversions
Inlining constant with var siblings popup_selector::k#0
Inlining constant with var siblings opcode#2
Inlining constant with var siblings opcode#13
Constant inlined opcode#2 = 'b'
Constant inlined popup_selector::k#0 = 0
Constant inlined opcode#13 = 'a'
Constant inlined opcode#2 = 'b'
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(screen+$28)
Consolidated array index constant in *(screen+$29)

View File

@ -237,8 +237,8 @@ Inlining constant with var siblings cnt#17
Inlining constant with var siblings cnt2#16
Inlining constant with var siblings cnt3#16
Constant inlined cnt2#16 = 0
Constant inlined cnt#17 = 0
Constant inlined cnt3#16 = 0
Constant inlined cnt#17 = 0
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(SCREEN+1)
Consolidated array index constant in *(SCREEN+2)

View File

@ -89,9 +89,9 @@ Successful SSA optimization Pass2ConstantIdentification
Inlining constant with different constant siblings idx#11
Inlining constant with different constant siblings idx#0
Inlining constant with different constant siblings idx#1
Constant inlined idx#11 = 0
Constant inlined idx#0 = ++0
Constant inlined idx#1 = ++++0
Constant inlined idx#11 = 0
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(SCREEN+++0)
Consolidated array index constant in *(SCREEN+++++0)

View File

@ -137,8 +137,8 @@ Inlining constant with different constant siblings idx#16
Inlining constant with different constant siblings idx#2
Inlining constant with different constant siblings idx#3
Constant inlined idx#2 = ++0
Constant inlined idx#3 = ++++0
Constant inlined idx#16 = 0
Constant inlined idx#3 = ++++0
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(SCREEN+++0)
Consolidated array index constant in *(SCREEN+++++0)

View File

@ -136,8 +136,8 @@ Inlining constant with different constant siblings idx#16
Inlining constant with different constant siblings idx#2
Inlining constant with different constant siblings idx#3
Constant inlined idx#2 = ++0
Constant inlined idx#3 = ++++0
Constant inlined idx#16 = 0
Constant inlined idx#3 = ++++0
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(SCREEN+++0)
Consolidated array index constant in *(SCREEN+++++0)

View File

@ -239,13 +239,10 @@ Constant inlined main::idx#17 = ++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#18 = ++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#19 = ++++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#12 = ++++++++++++++++++++++++0
Constant inlined main::idx#23 = ++++++++++++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#13 = ++++++++++++++++++++++++++0
Constant inlined main::idx#14 = ++++++++++++++++++++++++++++0
Constant inlined main::idx#15 = ++++++++++++++++++++++++++++++0
Constant inlined main::idx#20 = ++++++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#21 = ++++++++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#22 = ++++++++++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#23 = ++++++++++++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#0 = 0
Constant inlined main::idx#1 = ++0
Constant inlined main::idx#2 = ++++0
@ -255,9 +252,12 @@ Constant inlined main::idx#5 = ++++++++++0
Constant inlined main::idx#6 = ++++++++++++0
Constant inlined main::idx#7 = ++++++++++++++0
Constant inlined main::idx#8 = ++++++++++++++++0
Constant inlined main::idx#20 = ++++++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#9 = ++++++++++++++++++0
Constant inlined main::idx#10 = ++++++++++++++++++++0
Constant inlined main::idx#21 = ++++++++++++++++++++++++++++++++++++++++++0
Constant inlined main::idx#11 = ++++++++++++++++++++++0
Constant inlined main::idx#22 = ++++++++++++++++++++++++++++++++++++++++++++0
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(SCREEN+++++0)
Consolidated array index constant in *(SCREEN+++++++0)

View File

@ -168,8 +168,8 @@ Successful SSA optimization PassNFinalizeNumberTypeConversions
Inlining constant with var siblings ifunc::x#0
Inlining constant with var siblings ifunc::xsqr#0
Inlining constant with var siblings ifunc::delta#0
Constant inlined ifunc::xsqr#0 = 1
Constant inlined ifunc::delta#0 = 3
Constant inlined ifunc::xsqr#0 = 1
Constant inlined ifunc::x#0 = 1
Successful SSA optimization Pass2ConstantInlining
Adding NOP phi() at start of main

View File

@ -99,9 +99,9 @@ Removing unused procedure block __start
Removing unused procedure block __start::@1
Removing unused procedure block __start::@return
Successful SSA optimization PassNEliminateEmptyStart
Constant inlined main::$2 = 1*SIZEOF_UNSIGNED_INT
Constant inlined main::$3 = 1*SIZEOF_UNSIGNED_INT
Constant inlined main::$4 = 2*SIZEOF_UNSIGNED_INT
Constant inlined main::$2 = 1*SIZEOF_UNSIGNED_INT
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(SCREEN+1*SIZEOF_UNSIGNED_INT)
Consolidated array index constant in *((unsigned int *)&point1+OFFSET_STRUCT_POINT_POS+1*SIZEOF_UNSIGNED_INT)

View File

@ -119,10 +119,10 @@ Removing unused procedure block __start::@1
Removing unused procedure block __start::@return
Successful SSA optimization PassNEliminateEmptyStart
Constant inlined main::q_x#1 = point::p_x
Constant inlined point::return_y#1 = point::p_y
Constant inlined point::return_x#1 = point::p_x
Constant inlined point::return_y#0 = point::p_y
Constant inlined point::return_x#0 = point::p_x
Constant inlined point::return_y#1 = point::p_y
Constant inlined main::q_y#1 = point::p_y
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(main::SCREEN+1)

View File

@ -198,18 +198,18 @@ Constant main::$13 = (char *)points
Constant main::$14 = (char *)points+main::$6
Constant main::$15 = (char *)points+main::$7
Successful SSA optimization Pass2ConstantIdentification
Constant inlined main::$2 = 1*SIZEOF_STRUCT_POINT
Constant inlined main::$12 = (char *)points
Constant inlined main::$6 = 1*SIZEOF_STRUCT_POINT
Constant inlined main::$13 = (char *)points
Constant inlined main::$3 = 1*SIZEOF_STRUCT_POINT
Constant inlined main::$14 = (char *)points+1*SIZEOF_STRUCT_POINT
Constant inlined main::$15 = (char *)points+1*SIZEOF_STRUCT_POINT
Constant inlined main::$10 = (char *)points+1*SIZEOF_STRUCT_POINT
Constant inlined main::$11 = (char *)points+1*SIZEOF_STRUCT_POINT
Constant inlined main::$2 = 1*SIZEOF_STRUCT_POINT
Constant inlined main::$6 = 1*SIZEOF_STRUCT_POINT
Constant inlined main::$3 = 1*SIZEOF_STRUCT_POINT
Constant inlined main::$9 = (char *)points
Constant inlined main::$7 = 1*SIZEOF_STRUCT_POINT
Constant inlined main::$10 = (char *)points+1*SIZEOF_STRUCT_POINT
Constant inlined main::$8 = (char *)points
Constant inlined main::$11 = (char *)points+1*SIZEOF_STRUCT_POINT
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *((char *)points+OFFSET_STRUCT_POINT_Y)
Consolidated array index constant in *((char *)points+1*SIZEOF_STRUCT_POINT+OFFSET_STRUCT_POINT_Y)

View File

@ -583,9 +583,9 @@ Inlining constant with var siblings main::col#0
Inlining constant with var siblings main::i#0
Inlining constant with var siblings main::ch#0
Constant inlined main::screen#0 = (char *) 1024
Constant inlined main::col#0 = 0
Constant inlined main::i#0 = 0
Constant inlined main::sc#0 = (char *) 1024
Constant inlined main::col#0 = 0
Constant inlined main::row#0 = 0
Constant inlined main::ch#0 = 0
Successful SSA optimization Pass2ConstantInlining

View File

@ -160,8 +160,8 @@ Inlining constant with var siblings main::line#1
Inlining constant with var siblings main::c#0
Inlining constant with var siblings main::c1#0
Constant inlined main::c1#0 = 0
Constant inlined main::c#0 = 0
Constant inlined main::line#1 = 0
Constant inlined main::c#0 = 0
Successful SSA optimization Pass2ConstantInlining
Consolidated constant in assignment main::$7
Successful SSA optimization Pass2ConstantAdditionElimination

View File

@ -103,9 +103,9 @@ Successful SSA optimization PassNEliminateUnusedVars
Inlining constant with different constant siblings main::i#0
Inlining constant with different constant siblings main::i#1
Inlining constant with different constant siblings main::i#4
Constant inlined main::i#4 = ++++0
Constant inlined main::i#0 = 0
Constant inlined main::i#1 = ++0
Constant inlined main::i#4 = ++++0
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(main::SCREEN+++0)
Consolidated array index constant in *(main::SCREEN+++++0)

View File

@ -241,18 +241,18 @@ Inlining constant with different constant siblings main::a#22
Inlining constant with different constant siblings main::a#25
Inlining constant with different constant siblings main::a#28
Inlining constant with different constant siblings main::a#31
Constant inlined main::a#22 = ++++++++++++++++3
Constant inlined main::a#10 = ++++++++3
Constant inlined main::a#31 = ++++++++++++++++++++++3
Constant inlined main::a#25 = ++++++++++++++++++3
Constant inlined main::a#13 = ++++++++++3
Constant inlined main::a#0 = 3
Constant inlined main::a#19 = ++++++++++++++3
Constant inlined main::a#28 = ++++++++++++++++++++3
Constant inlined main::a#1 = ++3
Constant inlined main::a#16 = ++++++++++++3
Constant inlined main::a#22 = ++++++++++++++++3
Constant inlined main::a#7 = ++++++3
Constant inlined main::a#10 = ++++++++3
Constant inlined main::a#31 = ++++++++++++++++++++++3
Constant inlined main::a#4 = ++++3
Constant inlined main::a#25 = ++++++++++++++++++3
Constant inlined main::a#13 = ++++++++++3
Successful SSA optimization Pass2ConstantInlining
Consolidated array index constant in *(main::SCREEN+3)
Consolidated array index constant in *(main::SCREEN+++3)