[llvm-commits] [llvm] r114684 - /llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp

[Jim Grosbach]

On Sep 23, 2010, at 11:57 AM, Benjamin Kramer wrote:

> Author: d0k
> Date: Thu Sep 23 13:57:26 2010
> New Revision: 114684
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=114684&view=rev
> Log:
> Unbreak build. Jim, please review.
> 
> Modified:
>    llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
> 
> Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=114684&r1=114683&r2=114684&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Thu Sep 23 13:57:26 2010
> @@ -1216,7 +1216,7 @@
>   // FIXME: This really should be in AsmPrinter/ARMInstPrinter.cpp, not here.
>   //        Need a way to ask "isTargetDarwin()" there, first, though.
>   if (MI->getOpcode() == ARM::TRAP && !Subtarget->isTargetDarwin()) {
> -    OS << "\t.long\t2147348462\t\t" << MAI->getCommentString() << "trap";
> +    OS << "\t.long\t3892305662\t\t" << MAI->getCommentString() << "trap";
>   } else if (MI->getOpcode() == ARM::tTRAP && !Subtarget->isTargetDarwin()) {
>     OS << "\t.short\t57086\t\t\t" << MAI->getCommentString() << " trap";
>   } else
> @@ -1729,7 +1729,7 @@
>     // FIXME: Remove this special case when they do.
>     if (!Subtarget->isTargetDarwin()) {
>       //.long 0xe7ffdefe ${:comment} trap
> -      uint32_t Val = 0xe7ffdefee;
> +      uint32_t Val = 0xe7ffdefe;
 
The value was correct before. Clang is just being picky about the constant type. Not sure why I can't reproduce locally; I am building with clang. Odd. From the bot emails, looks like it only issues that diagnostic for this line on non-Darwin hosts?

Fixed the value in r114687, with an explicit "UL" suffix on the constant this time. Hopefully the bots will like that...

>       OutStreamer.AddComment("trap");
>       OutStreamer.EmitIntValue(Val, 4);
>       return;
> @@ -1740,8 +1740,8 @@
>     // Non-Darwin binutils don't yet support the "trap" mnemonic.
>     // FIXME: Remove this special case when they do.
>     if (!Subtarget->isTargetDarwin()) {
> -      //.long 0xe7ffdefe ${:comment} trap
> -      uint32_t Val = 0xdefe;
> +      //.short 57086 ${:comment} trap
> +      uint16_t Val = 0xdefe;
>       OutStreamer.AddComment("trap");
>       OutStreamer.EmitIntValue(Val, 2);
>       return;
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits