X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FX86%2FCodeGen.hs;h=799dec328fa8bbea30d7c38de84dfbc927ba848f;hb=e5fba2f55f560b41e27047bf59958729d51aca84;hp=4ca8f1584095a782cdfc74cc50f1dea7a78fa4a6;hpb=9d9eef1f78e25c716e2c0c7559005b730f425231;p=ghc-hetmet.git diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs index 4ca8f15..799dec3 100644 --- a/compiler/nativeGen/X86/CodeGen.hs +++ b/compiler/nativeGen/X86/CodeGen.hs @@ -27,7 +27,7 @@ where #include "HsVersions.h" #include "nativeGen/NCG.h" -#include "MachDeps.h" +#include "../includes/MachDeps.h" -- NCG stuff: import X86.Instr @@ -1633,7 +1633,7 @@ genCCall target dest_regs args = do w = typeWidth ty r_dest_hi = getHiVRegFromLo r_dest r_dest = getRegisterReg (CmmLocal dest) - assign_code many = panic "genCCall.assign_code many" + assign_code many = pprPanic "genCCall.assign_code - too many return values:" (ppr many) return (push_code `appOL` call `appOL` @@ -1781,9 +1781,7 @@ genCCall target dest_regs args = do assign_code [CmmHinted dest _hint] = case typeWidth rep of W32 | isFloatType rep -> unitOL (MOV (floatSize W32) (OpReg xmm0) (OpReg r_dest)) -v v v v v v v W64 | isFloatType rep -> unitOL (MOV (floatSize W64) (OpReg xmm0) (OpReg r_dest)) -^ ^ ^ ^ ^ ^ ^ _ -> unitOL (MOV (cmmTypeSize rep) (OpReg rax) (OpReg r_dest)) where rep = localRegType dest