s390x: use "lghi" for immediate values to fix build with clang

Some of the kernels written in assembly utilize a "load address"
instruction for loading an immediate value into a register. That is
both unnecessarily complex and LLVM's assembler does not understand that
specific syntax. Thus, replace with the appropriate "load immediate"
instruction, which is also clearer to read.

Signed-off-by: Marius Hillenbrand <mhillen@linux.ibm.com>

diff --git a/kernel/zarch/ctrmm4x4V.S b/kernel/zarch/ctrmm4x4V.S
index c0e4df1..123f2ea 100644 (file)
--- a/kernel/zarch/ctrmm4x4V.S
+++ b/kernel/zarch/ctrmm4x4V.S
@@ -198,7 +198,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,4
       nill LOCAL_VAR1,3 
 #else
-    la LOCAL_VAR1,3(0,0)
+    lghi LOCAL_VAR1,3
     NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x4_BK_Store
@@ -254,7 +254,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,4
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x4_BK_Store
@@ -305,7 +305,7 @@ ALIGN_4
        RefreshTempBk LOCAL_VAR1,BK,OFF,1,4
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/
 #endif 
 jz .L1x4_BK_Store
@@ -385,7 +385,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x2_BK_Store
@@ -442,7 +442,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x2_BK_Store
@@ -492,7 +492,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,1,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L1x2_BK_Store
@@ -568,7 +568,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x1_BK_Store
@@ -620,7 +620,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x1_BK_Store
@@ -670,7 +670,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,1,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L1x1_BK_Store

diff --git a/kernel/zarch/gemm8x4V.S b/kernel/zarch/gemm8x4V.S
index 27fd5f5..633e60e 100644 (file)
--- a/kernel/zarch/gemm8x4V.S
+++ b/kernel/zarch/gemm8x4V.S
@@ -147,7 +147,7 @@ brctg LOCAL_VAR1,.L8x4_4_BK
 
 ALIGN_4
 .L8x4_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L8x4_BK_Store
 
@@ -183,7 +183,7 @@ brctg LOCAL_VAR1,.L4x4_4_BK
 
 ALIGN_4
 .L4x4_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L4x4_BK_Store
 
@@ -217,7 +217,7 @@ brctg LOCAL_VAR1,.L2x4_4_BK
 
 ALIGN_4
 .L2x4_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L2x4_BK_Store
 
@@ -252,7 +252,7 @@ brctg LOCAL_VAR1,.L1x4_4_BK
 
 ALIGN_4
 .L1x4_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L1x4_BK_Store
 
@@ -309,7 +309,7 @@ brctg LOCAL_VAR1,.L8x2_4_BK
 
 ALIGN_4
 .L8x2_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L8x2_BK_Store
 
@@ -346,7 +346,7 @@ brctg LOCAL_VAR1,.L4x2_4_BK
 
 ALIGN_4
 .L4x2_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L4x2_BK_Store
 
@@ -380,7 +380,7 @@ brctg LOCAL_VAR1,.L2x2_4_BK
 
 ALIGN_4
 .L2x2_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L2x2_BK_Store
 
@@ -415,7 +415,7 @@ brctg LOCAL_VAR1,.L1x2_4_BK
 
 ALIGN_4
 .L1x2_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L1x2_BK_Store
 
@@ -471,7 +471,7 @@ brctg LOCAL_VAR1,.L8x1_4_BK
 
 ALIGN_4
 .L8x1_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L8x1_BK_Store
 
@@ -508,7 +508,7 @@ brctg LOCAL_VAR1,.L4x1_4_BK
 
 ALIGN_4
 .L4x1_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L4x1_BK_Store
 
@@ -542,7 +542,7 @@ brctg LOCAL_VAR1,.L2x1_4_BK
 
 ALIGN_4
 .L2x1_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L2x1_BK_Store
 
@@ -577,7 +577,7 @@ brctg LOCAL_VAR1,.L1x1_4_BK
 
 ALIGN_4
 .L1x1_mod:
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 jz .L1x1_BK_Store
 

diff --git a/kernel/zarch/strmm8x4V.S b/kernel/zarch/strmm8x4V.S
index f8e7481..e34a7a0 100644 (file)
--- a/kernel/zarch/strmm8x4V.S
+++ b/kernel/zarch/strmm8x4V.S
@@ -186,7 +186,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,8,4
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L8x4_BK_Store
@@ -239,7 +239,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,4
       nill LOCAL_VAR1,3 
 #else
-    la LOCAL_VAR1,3(0,0)
+    lghi LOCAL_VAR1,3
     NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x4_BK_Store
@@ -290,7 +290,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,4
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x4_BK_Store
@@ -341,7 +341,7 @@ ALIGN_4
        RefreshTempBk LOCAL_VAR1,BK,OFF,1,4
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/
 #endif 
 jz .L1x4_BK_Store
@@ -423,7 +423,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,8,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L8x2_BK_Store
@@ -475,7 +475,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x2_BK_Store
@@ -525,7 +525,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x2_BK_Store
@@ -575,7 +575,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,1,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L1x2_BK_Store
@@ -655,7 +655,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,8,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L8x1_BK_Store
@@ -708,7 +708,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x1_BK_Store
@@ -757,7 +757,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x1_BK_Store
@@ -807,7 +807,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,1,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L1x1_BK_Store

diff --git a/kernel/zarch/ztrmm4x4V.S b/kernel/zarch/ztrmm4x4V.S
index 52ee15f..6fd7f25 100644 (file)
--- a/kernel/zarch/ztrmm4x4V.S
+++ b/kernel/zarch/ztrmm4x4V.S
@@ -196,7 +196,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,4
       nill LOCAL_VAR1,3 
 #else
-    la LOCAL_VAR1,3(0,0)
+    lghi LOCAL_VAR1,3
     NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x4_BK_Store
@@ -256,7 +256,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,4
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x4_BK_Store
@@ -307,7 +307,7 @@ ALIGN_4
        RefreshTempBk LOCAL_VAR1,BK,OFF,1,4
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/
 #endif 
 jz .L1x4_BK_Store
@@ -390,7 +390,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x2_BK_Store
@@ -447,7 +447,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x2_BK_Store
@@ -497,7 +497,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,1,2
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L1x2_BK_Store
@@ -573,7 +573,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,4,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L4x1_BK_Store
@@ -625,7 +625,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,2,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L2x1_BK_Store
@@ -675,7 +675,7 @@ ALIGN_4
       RefreshTempBk LOCAL_VAR1,BK,OFF,1,1
       nill LOCAL_VAR1,3 
 #else
-la LOCAL_VAR1,3(0,0)
+lghi LOCAL_VAR1,3
 NGR LOCAL_VAR1,BK /*refresh BK*/ 
 #endif
 jz .L1x1_BK_Store