Parse the exception table

Author: smowton

src/java_bytecode/java_bytecode_parse_tree.h

@@ -82,8 +82,12 @@ class java_bytecode_parse_treet
       return instructions.back();
     }
 
-    class exceptiont
+    struct exceptiont
     {
+      std::size_t start_pc;
+      std::size_t end_pc;
+      std::size_t handler_pc;
+      symbol_typet catch_type;
     };
 
     typedef std::vector<exceptiont> exception_tablet;

src/java_bytecode/java_bytecode_parser.cpp

@@ -968,13 +968,20 @@ void java_bytecode_parsert::rmethod_attribute(methodt &method)
     rbytecode(method.instructions);
 
     u2 exception_table_length=read_u2();
+    method.exception_table.resize(exception_table_length);
 
     for(std::size_t e=0; e<exception_table_length; e++)
     {
-      u2 UNUSED start_pc=read_u2();
-      u2 UNUSED end_pc=read_u2();
-      u2 UNUSED handler_pc=read_u2();
-      u2 UNUSED catch_type=read_u2();
+      u2 start_pc=read_u2();
+      u2 end_pc=read_u2();
+      u2 handler_pc=read_u2();
+      u2 catch_type=read_u2();
+      method.exception_table[e].start_pc=start_pc;
+      method.exception_table[e].end_pc=end_pc;
+      method.exception_table[e].handler_pc=handler_pc;
+      if(catch_type!=0)
+        method.exception_table[e].catch_type=
+          to_symbol_type(pool_entry(catch_type).expr.type());
     }
 
     u2 attributes_count=read_u2();