[Git][ghc/ghc][wip/T23645] 2 commits: Add back exceptions for wasm and js

[Jaro Reinders (@Noughtmare)]

Jaro Reinders pushed to branch wip/T23645 at Glasgow Haskell Compiler / GHC


Commits:
7e70de5e by Jaro Reinders at 2023-07-19T17:33:56+02:00
Add back exceptions for wasm and js

- - - - -
e696f783 by Jaro Reinders at 2023-07-19T17:34:23+02:00
Try to fix AArch64

- - - - -


2 changed files:

- compiler/GHC/CmmToAsm/AArch64/CodeGen.hs
- testsuite/tests/codeGen/should_run/all.T


Changes:

=====================================
compiler/GHC/CmmToAsm/AArch64/CodeGen.hs
=====================================
@@ -1039,8 +1039,8 @@ getRegister' config plat expr
             code_x `appOL`
             code_y `snocOL`
             mul (OpReg tmp_w tmp) (OpReg w reg_x) (OpReg w reg_y) `snocOL`
-            CMP (OpReg tmp_w tmp) (OpRegExt tmp_w tmp ext_mode 0) `snocOL`
-            CSET (OpReg w dst) NE)
+            CMP (OpReg tmp_w tmp) (OpRegExt W32 tmp ext_mode 0) `snocOL`
+            CSET (OpReg W32 dst) NE)
 
 -- | Is a given number encodable as a bitmask immediate?
 --


=====================================
testsuite/tests/codeGen/should_run/all.T
=====================================
@@ -232,6 +232,9 @@ test('OrigThunkInfo', normal, compile_and_run, ['-forig-thunk-info'])
 # Note [MO_S_MulMayOflo significant width]) and may require fixing/adjustment.
 test('MulMayOflo_full',
      [ extra_files(['MulMayOflo.hs']),
-       when(unregisterised(), skip) ],
+       when(unregisterised(), skip),
+       when(arch('wasm32'), skip), # See #22532
+       when(arch('javascript'), skip)
+        ],
      multi_compile_and_run,
      ['MulMayOflo', [('MulMayOflo_full.cmm', '')], ''])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9513973b37c0cce03b7a57f28be124cdd54efb69...e696f783747a1591d629a1189c62e49820d00ff2

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9513973b37c0cce03b7a57f28be124cdd54efb69...e696f783747a1591d629a1189c62e49820d00ff2
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230719/d368dcbd/attachment-0001.html>