diff mbox

Fix C6x 24-bit unwinding opcodes

Message ID 201110031652.04721.paul@codesourcery.com
State New
Headers show

Commit Message

Paul Brook Oct. 3, 2011, 3:52 p.m. UTC 
The C6XABI defined persoality routines ID 3 and 4 use a single 24-bit block 
word of unwinding data.  Patch below makes sure this is preserved, rather than 
treating it as a set of unwinding opcode bytes.

I seem to have lost this bit of code when I merged the ARM and c6x 
implementations.

Applied to svn trunk.

Paul

2011-10-03  Paul Brook  <paul@codesourcery.com>

	libgcc/
	* unwind-arm-common.inc: Handle ID3/4 unwinding data.

Comments

Bernd Schmidt Oct. 21, 2011, 9:02 p.m. UTC | #1 
On 10/03/11 17:52, Paul Brook wrote:
> The C6XABI defined persoality routines ID 3 and 4 use a single 24-bit block 
> word of unwinding data.  Patch below makes sure this is preserved, rather than 
> treating it as a set of unwinding opcode bytes.
> 
> I seem to have lost this bit of code when I merged the ARM and c6x 
> implementations.
> 
> Applied to svn trunk.

Actually, it wasn't. I've corrected that now.

> Index: libgcc/unwind-arm-common.inc
> ===================================================================
> --- libgcc/unwind-arm-common.inc	(revision 179178)
> +++ libgcc/unwind-arm-common.inc	(working copy)
> @@ -583,7 +583,7 @@ __gnu_unwind_pr_common (_Unwind_State st
>        uws.words_left = 0;
>        uws.bytes_left = 3;
>      }
> -  else
> +  else if (id < 3)
>      {
>        uws.words_left = (uws.data >> 16) & 0xff;
>        uws.data <<= 16;
> 


Bernd
diff mbox

Patch

Index: libgcc/unwind-arm-common.inc
===================================================================
--- libgcc/unwind-arm-common.inc	(revision 179178)
+++ libgcc/unwind-arm-common.inc	(working copy)
@@ -583,7 +583,7 @@  __gnu_unwind_pr_common (_Unwind_State st
       uws.words_left = 0;
       uws.bytes_left = 3;
     }
-  else
+  else if (id < 3)
     {
       uws.words_left = (uws.data >> 16) & 0xff;
       uws.data <<= 16;