exception.cc (PERSONALITY_FUNCTION): Simplify leb128 handling.

* exception.cc (PERSONALITY_FUNCTION): Simplify
        leb128 handling.

From-SVN: r45317
This commit is contained in:
Jason Merrill 2001-08-31 08:27:32 -04:00 committed by Jason Merrill
parent ea57133ffe
commit 6c8d43e78d
3 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2001-08-31 Jason Merrill <jason_merrill@redhat.com>
* exception.cc (PERSONALITY_FUNCTION): Simplify
leb128 handling.
2001-08-31 Tom Tromey <tromey@redhat.com>
* java/io/ByteArrayInputStream.java: Merged with Classpath.

View File

@ -120,7 +120,7 @@ static const unsigned char *
parse_lsda_header (_Unwind_Context *context, const unsigned char *p,
lsda_header_info *info)
{
_Unwind_Ptr tmp;
_Unwind_Word tmp;
unsigned char lpstart_encoding;
info->Start = (context ? _Unwind_GetRegionStart (context) : 0);
@ -236,7 +236,7 @@ PERSONALITY_FUNCTION (int version,
return _URC_CONTINUE_UNWIND;
else
{
_Unwind_Ptr cs_lp, cs_action;
_Unwind_Word cs_lp, cs_action;
do
{
p = read_uleb128 (p, &cs_lp);
@ -255,7 +255,8 @@ PERSONALITY_FUNCTION (int version,
// Search the call-site table for the action associated with this IP.
while (p < info.action_table)
{
_Unwind_Ptr cs_start, cs_len, cs_lp, cs_action;
_Unwind_Ptr cs_start, cs_len, cs_lp;
_Unwind_Word cs_action;
// Note that all call-site encodings are "absolute" displacements.
p = read_encoded_value (0, info.call_site_encoding, p, &cs_start);
@ -301,15 +302,13 @@ PERSONALITY_FUNCTION (int version,
else
{
// Otherwise we have a catch handler.
signed long ar_filter, ar_disp;
_Unwind_Sword ar_filter, ar_disp;
while (1)
{
_Unwind_Ptr tmp;
p = action_record;
p = read_sleb128 (p, &tmp); ar_filter = tmp;
read_sleb128 (p, &tmp); ar_disp = tmp;
p = read_sleb128 (p, &ar_filter);
read_sleb128 (p, &ar_disp);
if (ar_filter == 0)
{

View File

@ -197,7 +197,7 @@ PERSONALITY_FUNCTION (int version,
}
else
{
_Unwind_Ptr cs_lp, cs_action;
_Unwind_Word cs_lp, cs_action;
do
{
p = read_uleb128 (p, &cs_lp);
@ -216,7 +216,8 @@ PERSONALITY_FUNCTION (int version,
// Search the call-site table for the action associated with this IP.
while (p < info.action_table)
{
_Unwind_Ptr cs_start, cs_len, cs_lp, cs_action;
_Unwind_Ptr cs_start, cs_len, cs_lp;
_Unwind_Word cs_action;
// Note that all call-site encodings are "absolute" displacements.
p = read_encoded_value (0, info.call_site_encoding, p, &cs_start);