diff --git a/pom.xml b/pom.xml index e4abd072c..493b08836 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ se.triad.kickass kickass-cruncher-plugins - 2.0 + 2.1 diff --git a/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/_remote.repositories b/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/_remote.repositories new file mode 100644 index 000000000..6bdc65e8c --- /dev/null +++ b/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/_remote.repositories @@ -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>= diff --git a/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/kickass-cruncher-plugins-2.1.jar b/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/kickass-cruncher-plugins-2.1.jar new file mode 100644 index 000000000..3730f8db6 Binary files /dev/null and b/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/kickass-cruncher-plugins-2.1.jar differ diff --git a/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/kickass-cruncher-plugins-2.1.pom b/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/kickass-cruncher-plugins-2.1.pom new file mode 100644 index 000000000..0472c6243 --- /dev/null +++ b/repo/se/triad/kickass/kickass-cruncher-plugins/2.1/kickass-cruncher-plugins-2.1.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + se.triad.kickass + kickass-cruncher-plugins + 2.1 + POM was created from install:install-file + diff --git a/repo/se/triad/kickass/kickass-cruncher-plugins/maven-metadata.xml b/repo/se/triad/kickass/kickass-cruncher-plugins/maven-metadata.xml index 8af2f2250..953b600cc 100644 --- a/repo/se/triad/kickass/kickass-cruncher-plugins/maven-metadata.xml +++ b/repo/se/triad/kickass/kickass-cruncher-plugins/maven-metadata.xml @@ -3,10 +3,11 @@ se.triad.kickass kickass-cruncher-plugins - 2.0 + 2.1 2.0 + 2.1 - 20201230180211 + 20231125150820 diff --git a/src/main/repo/mvn-repo-install-cruncherplugins.sh b/src/main/repo/mvn-repo-install-cruncherplugins.sh index 04bb9468c..b9caa2a6e 100755 --- a/src/main/repo/mvn-repo-install-cruncherplugins.sh +++ b/src/main/repo/mvn-repo-install-cruncherplugins.sh @@ -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/ diff --git a/src/test/ref/bool-pointer.log b/src/test/ref/bool-pointer.log index 17d9faffb..526d928b7 100644 --- a/src/test/ref/bool-pointer.log +++ b/src/test/ref/bool-pointer.log @@ -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 diff --git a/src/test/ref/cast-precedence-problem.log b/src/test/ref/cast-precedence-problem.log index 971c330e9..c805751de 100644 --- a/src/test/ref/cast-precedence-problem.log +++ b/src/test/ref/cast-precedence-problem.log @@ -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) diff --git a/src/test/ref/cstyle-decl-var.log b/src/test/ref/cstyle-decl-var.log index b4a946de8..2ea1ec427 100644 --- a/src/test/ref/cstyle-decl-var.log +++ b/src/test/ref/cstyle-decl-var.log @@ -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) diff --git a/src/test/ref/ducks-total.log b/src/test/ref/ducks-total.log index 0f3da0a8a..bc1ca64e0 100644 --- a/src/test/ref/ducks-total.log +++ b/src/test/ref/ducks-total.log @@ -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 diff --git a/src/test/ref/ducks-total.sym b/src/test/ref/ducks-total.sym index aec912a5a..8467086a8 100644 --- a/src/test/ref/ducks-total.sym +++ b/src/test/ref/ducks-total.sym @@ -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 diff --git a/src/test/ref/euclid-problem-2.log b/src/test/ref/euclid-problem-2.log index 4bd995818..d64d0c79b 100644 --- a/src/test/ref/euclid-problem-2.log +++ b/src/test/ref/euclid-problem-2.log @@ -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) diff --git a/src/test/ref/examples/c64/zpcode/zpcode.log b/src/test/ref/examples/c64/zpcode/zpcode.log index 5de3e625f..a67ed3f4d 100644 --- a/src/test/ref/examples/c64/zpcode/zpcode.log +++ b/src/test/ref/examples/c64/zpcode/zpcode.log @@ -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) diff --git a/src/test/ref/inline-kasm-clobber.log b/src/test/ref/inline-kasm-clobber.log index a6e71096c..5b118022c 100644 --- a/src/test/ref/inline-kasm-clobber.log +++ b/src/test/ref/inline-kasm-clobber.log @@ -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) diff --git a/src/test/ref/inmem-const-array.log b/src/test/ref/inmem-const-array.log index ad9287d60..0e9e8007a 100644 --- a/src/test/ref/inmem-const-array.log +++ b/src/test/ref/inmem-const-array.log @@ -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) diff --git a/src/test/ref/inmemarray.log b/src/test/ref/inmemarray.log index 268b56216..20e47d494 100644 --- a/src/test/ref/inmemarray.log +++ b/src/test/ref/inmemarray.log @@ -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) diff --git a/src/test/ref/intermediates-simple.log b/src/test/ref/intermediates-simple.log index e1c27b801..d76e1647c 100644 --- a/src/test/ref/intermediates-simple.log +++ b/src/test/ref/intermediates-simple.log @@ -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 diff --git a/src/test/ref/intermediates-struct.log b/src/test/ref/intermediates-struct.log index e5d380194..a2401fa1c 100644 --- a/src/test/ref/intermediates-struct.log +++ b/src/test/ref/intermediates-struct.log @@ -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 diff --git a/src/test/ref/irq-local-var-overlap-problem.log b/src/test/ref/irq-local-var-overlap-problem.log index e6cb4199f..9c669ff2f 100644 --- a/src/test/ref/irq-local-var-overlap-problem.log +++ b/src/test/ref/irq-local-var-overlap-problem.log @@ -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) diff --git a/src/test/ref/loophead-problem-3.log b/src/test/ref/loophead-problem-3.log index 637540734..b66db384b 100644 --- a/src/test/ref/loophead-problem-3.log +++ b/src/test/ref/loophead-problem-3.log @@ -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) diff --git a/src/test/ref/loophead-problem.log b/src/test/ref/loophead-problem.log index 47c442d02..06f963846 100644 --- a/src/test/ref/loophead-problem.log +++ b/src/test/ref/loophead-problem.log @@ -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) diff --git a/src/test/ref/modglobal.log b/src/test/ref/modglobal.log index 955b0c772..df4bc8c46 100644 --- a/src/test/ref/modglobal.log +++ b/src/test/ref/modglobal.log @@ -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) diff --git a/src/test/ref/preprocessor-4.log b/src/test/ref/preprocessor-4.log index 4b8198ba2..0c3c62a13 100644 --- a/src/test/ref/preprocessor-4.log +++ b/src/test/ref/preprocessor-4.log @@ -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) diff --git a/src/test/ref/problem-struct-inline-parameter-1.log b/src/test/ref/problem-struct-inline-parameter-1.log index 288ce050f..ef0b3154c 100644 --- a/src/test/ref/problem-struct-inline-parameter-1.log +++ b/src/test/ref/problem-struct-inline-parameter-1.log @@ -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) diff --git a/src/test/ref/problem-struct-inline-parameter.log b/src/test/ref/problem-struct-inline-parameter.log index 90545c237..35300c92e 100644 --- a/src/test/ref/problem-struct-inline-parameter.log +++ b/src/test/ref/problem-struct-inline-parameter.log @@ -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) diff --git a/src/test/ref/sizeof-types.log b/src/test/ref/sizeof-types.log index b063903a5..b21cd8ea2 100644 --- a/src/test/ref/sizeof-types.log +++ b/src/test/ref/sizeof-types.log @@ -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) diff --git a/src/test/ref/sqr-delta.log b/src/test/ref/sqr-delta.log index 8e9d5d606..a515ccee8 100644 --- a/src/test/ref/sqr-delta.log +++ b/src/test/ref/sqr-delta.log @@ -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 diff --git a/src/test/ref/struct-43.log b/src/test/ref/struct-43.log index eaa4f921f..724fdea79 100644 --- a/src/test/ref/struct-43.log +++ b/src/test/ref/struct-43.log @@ -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) diff --git a/src/test/ref/struct-5.log b/src/test/ref/struct-5.log index 562daa3bc..5fae21ceb 100644 --- a/src/test/ref/struct-5.log +++ b/src/test/ref/struct-5.log @@ -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) diff --git a/src/test/ref/struct-ptr-7.log b/src/test/ref/struct-ptr-7.log index b7ddbdf03..100bb7424 100644 --- a/src/test/ref/struct-ptr-7.log +++ b/src/test/ref/struct-ptr-7.log @@ -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) diff --git a/src/test/ref/test-keyboard.log b/src/test/ref/test-keyboard.log index 8ac6f08aa..4ca5bbf32 100644 --- a/src/test/ref/test-keyboard.log +++ b/src/test/ref/test-keyboard.log @@ -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 diff --git a/src/test/ref/test-word-size-arrays.log b/src/test/ref/test-word-size-arrays.log index 77e574c60..cefc565b4 100644 --- a/src/test/ref/test-word-size-arrays.log +++ b/src/test/ref/test-word-size-arrays.log @@ -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 diff --git a/src/test/ref/unroll-for-min.log b/src/test/ref/unroll-for-min.log index 84c32a0d5..0f8dd6580 100644 --- a/src/test/ref/unroll-for-min.log +++ b/src/test/ref/unroll-for-min.log @@ -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) diff --git a/src/test/ref/unroll-loop-modifyvar.log b/src/test/ref/unroll-loop-modifyvar.log index 43d342b4d..3729e2a22 100644 --- a/src/test/ref/unroll-loop-modifyvar.log +++ b/src/test/ref/unroll-loop-modifyvar.log @@ -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)