radare2/shlr/java/class.c

8571 lines
324 KiB
C
Raw Normal View History

/* Apache 2.0 - Copyright 2007-2015 - pancake and dso
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
class.c rewrite: Adam Pridgen <dso@rice.edu || adam.pridgen@thecoverofnight.com>
*/
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
#include <unistd.h>
#include <r_types.h>
#include <r_util.h>
#include <r_bin.h>
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
#include <math.h>
#include <sdb.h>
2014-03-18 00:36:54 +00:00
#include "class.h"
#include "dsojson.h"
static PrintfCallback Eprintf = (PrintfCallback)printf;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
#ifdef IFDBG
#undef IFDBG
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
#endif
#define DO_THE_DBG 0
#define IFDBG if(DO_THE_DBG)
2013-12-07 22:45:55 +00:00
#define IFINT if(0)
2014-05-12 02:06:40 +00:00
#define MAX_CPITEMS 8192
2014-06-25 00:07:38 +00:00
R_API char * U(r_bin_java_unmangle_method)(const char *flags, const char *name, const char *params, const char *r_value);
R_API int r_bin_java_is_fm_type_private(RBinJavaField *fm_type);
R_API int r_bin_java_is_fm_type_protected(RBinJavaField *fm_type);
2014-06-25 02:11:43 +00:00
R_API ut32 U(r_bin_java_swap_uint)(ut32 x);
//R_API const char * r_bin_java_get_this_class_name(RBinJavaObj *bin);
R_API void U(add_cp_objs_to_sdb)(RBinJavaObj *bin);
R_API void U(add_field_infos_to_sdb)(RBinJavaObj *bin);
R_API void U(add_method_infos_to_sdb)(RBinJavaObj *bin);
R_API RList * retrieve_all_access_string_and_value (RBinJavaAccessFlags *access_flags);
R_API char * retrieve_access_string(ut16 flags, RBinJavaAccessFlags *access_flags);
R_API ut16 calculate_access_value(const char * access_flags_str, RBinJavaAccessFlags *access_flags);
R_API int r_bin_java_new_bin (RBinJavaObj *bin, ut64 loadaddr, Sdb *kv, const ut8 * buf, ut64 len);
R_API int extract_type_value (const char *arg_str, char **output);
R_API int r_bin_java_check_reset_cp_obj(RBinJavaCPTypeObj* cp_obj, ut8 tag);
R_API ut8 * r_bin_java_cp_get_4bytes(ut8 tag, ut32 *out_sz, const ut8 * buf, const ut64 len);
R_API ut8 * r_bin_java_cp_get_8bytes(ut8 tag, ut32 *out_sz, const ut8 * buf, const ut64 len);
R_API ut8 * r_bin_java_cp_get_utf8(ut8 tag, ut32 *out_sz, const ut8 * buf, const ut64 len);
R_API RBinJavaCPTypeObj* r_bin_java_get_item_from_bin_cp_list(RBinJavaObj *bin, ut64 idx);
R_API RBinJavaCPTypeObj* r_bin_java_get_item_from_cp_item_list(RList *cp_list, ut64 idx);
// Allocs for objects
2014-06-25 02:11:43 +00:00
R_API RBinJavaCPTypeObj* r_bin_java_class_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_fieldref_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_methodref_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_interfacemethodref_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_name_and_type_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_string_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_integer_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_float_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_long_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_double_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_utf8_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 offset);
R_API RBinJavaCPTypeObj* r_bin_java_do_nothing_new(RBinJavaObj *bin, ut8* buffer, ut64 sz);
R_API RBinJavaCPTypeObj* r_bin_java_clone_cp_item(RBinJavaCPTypeObj *obj);
R_API RBinJavaCPTypeObj* r_bin_java_clone_cp_idx(RBinJavaObj *bin, ut32 idx);
R_API RBinJavaCPTypeObj* r_bin_java_methodhandle_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 sz);
R_API RBinJavaCPTypeObj* r_bin_java_methodtype_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 sz);
R_API RBinJavaCPTypeObj* r_bin_java_invokedynamic_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 sz);
// Deallocs for type objects
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_default_free(void /*RBinJavaCPTypeObj*/ *obj);
R_API void r_bin_java_obj_free(void /*RBinJavaCPTypeObj*/ *obj);
R_API void r_bin_java_utf8_info_free(void /*RBinJavaCPTypeObj*/ *obj);
R_API void r_bin_java_do_nothing_free(void /*RBinJavaCPTypeObj*/ *obj);
R_API void r_bin_java_fmtype_free (void /*RBinJavaField*/* fm_type);
// handle freeing the lists
// handle the reading of the various field
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_read_next_attr(RBinJavaObj *bin, const ut64 offset, const ut8* buf, const ut64 len);
R_API RBinJavaCPTypeObj* r_bin_java_read_next_constant_pool_item(RBinJavaObj *bin, const ut64 offset, const ut8 *buf, ut64 len);
R_API RBinJavaAttrMetas* r_bin_java_get_attr_type_by_name(const char *name);
R_API RBinJavaCPTypeObj* r_bin_java_get_java_null_cp();
R_API ut64 r_bin_java_read_class_file2(RBinJavaObj *bin, const ut64 offset, const ut8 *buf, ut64 len);
R_API RBinJavaAttrInfo* r_bin_java_get_attr_from_field(RBinJavaField *field, R_BIN_JAVA_ATTR_TYPE attr_type, ut32 pos);
R_API RBinJavaField* r_bin_java_read_next_field(RBinJavaObj *bin, const ut64 offset, const ut8 * buffer, const ut64 len);
R_API RBinJavaField* r_bin_java_read_next_method(RBinJavaObj *bin, const ut64 offset, const ut8 * buffer, const ut64 len);
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_utf8_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_name_and_type_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_double_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_long_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_float_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_integer_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_string_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_classref_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_fieldref_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_methodref_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_interfacemethodref_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_unknown_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_null_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_unknown_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_methodhandle_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_methodtype_cp_summary(RBinJavaCPTypeObj* obj);
R_API void r_bin_java_print_invokedynamic_cp_summary(RBinJavaCPTypeObj* obj);
R_API RBinJavaCPTypeObj* r_bin_java_unknown_cp_new(RBinJavaObj *bin, ut8* buffer, ut64 sz);
R_API RBinJavaInterfaceInfo* r_bin_java_interface_new(RBinJavaObj *bin, const ut8 *buf, ut64 sz);
R_API RBinJavaInterfaceInfo* r_bin_java_read_next_interface_item(RBinJavaObj *bin, const ut64 offset, const ut8 *buf, ut64 len);
R_API void r_bin_java_interface_free(void /*RBinJavaInterfaceInfo*/ *obj);
R_API void r_bin_java_stack_frame_free(void /*RBinJavaStackMapFrame*/* obj);
R_API void r_bin_java_stack_map_table_attr_free(void /*RBinJavaAttrInfo*/* attr);
R_API void r_bin_java_verification_info_free(void /*RBinJavaVerificationObj*/* obj);
R_API void r_bin_java_print_stack_map_table_attr_summary(RBinJavaAttrInfo *obj);
R_API void r_bin_java_print_stack_map_frame_summary(RBinJavaStackMapFrame *obj);
R_API void r_bin_java_print_verification_info_summary(RBinJavaVerificationObj *obj);
R_API RBinJavaStackMapFrame* r_bin_java_build_stack_frame_from_local_variable_table(RBinJavaObj *bin, RBinJavaAttrInfo *attr);
R_API void U(r_bin_java_print_stack_map_append_frame_summary)(RBinJavaStackMapFrame *obj);
R_API void U(r_bin_java_stack_frame_default_free) (void /*RBinJavaStackMapFrame*/ *stack_frame);
R_API void U(r_bin_java_stack_frame_do_nothing_free) (void /*RBinJavaStackMapFrame*/ *stack_frame);
R_API void U(r_bin_java_stack_frame_do_nothing_new) (RBinJavaObj *bin, RBinJavaStackMapFrame *stack_frame, ut64 offset);
R_API RBinJavaStackMapFrame* r_bin_java_stack_map_frame_new (ut8* buffer, ut64 sz, RBinJavaStackMapFrame *p_frame, ut64 buf_offset);
//R_API RBinJavaStackMapFrame* r_bin_java_stack_map_frame_new (ut8* buffer, ut64 sz, ut64 buf_offset);
R_API RBinJavaElementValue* r_bin_java_element_value_new (ut8* buffer, ut64 sz, ut64 buf_offset);
//R_API RBinJavaVerificationObj* r_bin_java_read_next_verification_info_new(ut8* buffer, ut64 sz, ut64 buf_offset);
R_API RBinJavaAnnotation* r_bin_java_annotation_new(ut8* buffer, ut64 sz, ut64 buf_offset);
R_API RBinJavaElementValuePair* r_bin_java_element_pair_new(ut8* buffer, ut64 sz, ut64 buf_offset);
R_API RBinJavaElementValue* r_bin_java_element_value_new(ut8* buffer, ut64 sz, ut64 buf_offset);
//R_API RBinJavaBootStrapArgument* r_bin_java_bootstrap_method_argument_new(ut8* buffer, ut64 sz, ut64 buf_offset);
R_API RBinJavaBootStrapMethod* r_bin_java_bootstrap_method_new(ut8* buffer, ut64 sz, ut64 buf_offset);
R_API RBinJavaAnnotationsArray* r_bin_java_annotation_array_new(ut8* buffer, ut64 sz, ut64 buf_offset);
R_API RBinJavaElementValueMetas* r_bin_java_get_ev_meta_from_tag(ut8 tag);
R_API RBinJavaCPTypeMetas* U(r_bin_java_get_cp_meta_from_tag)(ut8 tag);
R_API void r_bin_java_inner_classes_attr_entry_free (void /*RBinJavaClassesAttribute*/ * attr);
R_API void r_bin_java_annotation_default_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_enclosing_methods_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_local_variable_type_table_attr_entry_free(void /*RBinJavaLocalVariableTypeAttribute*/ *lvattr);
R_API void r_bin_java_local_variable_type_table_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_signature_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_source_debug_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_element_value_free (void /*RBinJavaElementValue*/* element_value);
R_API void r_bin_java_element_pair_free(void /*RBinJavaElementValuePair*/ *ev_pair);
R_API void r_bin_java_annotation_free(void /*RBinJavaAnnotation*/ *annotation);
R_API void r_bin_java_rtv_annotations_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_rti_annotations_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_annotation_array_free(void /*RBinJavaAnnotationsArray*/ *annotation_array);
R_API void r_bin_java_bootstrap_methods_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_bootstrap_method_free(void /*RBinJavaBootStrapMethod*/ *bsm);
R_API void r_bin_java_bootstrap_method_argument_free(void /*RBinJavaBootStrapArgument*/ *bsm_arg);
R_API void r_bin_java_rtvp_annotations_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_rtip_annotations_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_unknown_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_code_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_constant_value_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_deprecated_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_exceptions_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_inner_classes_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_line_number_table_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_local_variable_table_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_source_code_file_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_synthetic_attr_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_print_annotation_default_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_enclosing_methods_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_local_variable_type_attr_summary(RBinJavaLocalVariableTypeAttribute *lvattr);
R_API void r_bin_java_print_local_variable_type_table_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_signature_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_source_debug_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_element_value_summary(RBinJavaElementValue *element_value);
R_API void r_bin_java_print_annotation_summary(RBinJavaAnnotation *annotation);
R_API void r_bin_java_print_element_pair_summary(RBinJavaElementValuePair *ev_pair);
R_API void r_bin_java_print_bootstrap_methods_attr_summary(RBinJavaAttrInfo *attr);
//R_API void r_bin_java_bootstrap_method_summary(RBinJavaBootStrapMethod *bsm);
//R_API void r_bin_java_bootstrap_method_argument_summary(RBinJavaBootStrapArgument *bsm_arg);
R_API void r_bin_java_print_rtv_annotations_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_rti_annotations_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_annotation_array_summary(RBinJavaAnnotationsArray *annotation_array);
R_API void r_bin_java_print_rtvp_annotations_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_rtip_annotations_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_attribute_free(void /*RBinJavaAttrInfo*/ *attr);
R_API void r_bin_java_constant_pool(void /*RBinJavaCPTypeObj*/* obj);
R_API void r_bin_java_print_field_summary(RBinJavaField *field);
//R_API void r_bin_java_print_interface_summary(RBinJavaField *field);
R_API void r_bin_java_print_method_summary(RBinJavaField *field);
R_API void r_bin_java_print_code_exceptions_attr_summary(RBinJavaExceptionEntry *exc_entry);
R_API void r_bin_java_print_code_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_constant_value_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_deprecated_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_exceptions_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_classes_attr_summary(RBinJavaClassesAttribute *icattr);
R_API void r_bin_java_print_inner_classes_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_line_number_table_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_local_variable_attr_summary(RBinJavaLocalVariableAttribute *lvattr);
R_API void r_bin_java_print_local_variable_table_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_source_code_file_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_synthetic_attr_summary(RBinJavaAttrInfo *attr);
R_API void r_bin_java_print_attr_summary(RBinJavaAttrInfo *attr);
R_API RBinJavaAttrInfo* r_bin_java_read_next_attr_from_buffer(ut8 *buffer, st64 sz, st64 buf_offset);
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_unknown_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_annotation_default_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_enclosing_methods_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_local_variable_type_table_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_signature_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_source_debug_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_bootstrap_methods_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_rtv_annotations_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_rti_annotations_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_rtvp_annotations_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_rtip_annotations_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_code_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_constant_value_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_deprecated_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_exceptions_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_inner_classes_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_line_number_table_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_local_variable_table_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_source_code_file_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_stack_map_table_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API RBinJavaAttrInfo* r_bin_java_synthetic_attr_new(ut8 *buf, ut64 sz, ut64 buf_offset);
R_API ut64 r_bin_java_unknown_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_annotation_default_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_enclosing_methods_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_local_variable_type_table_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_signature_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_source_debug_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_bootstrap_methods_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_rtv_annotations_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_rti_annotations_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_rtvp_annotations_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_rtip_annotations_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_code_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_constant_value_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_deprecated_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_exceptions_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_inner_classes_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_line_number_table_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_local_variable_table_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_source_code_file_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_stack_map_table_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_synthetic_attr_calc_size(RBinJavaAttrInfo *attr);
R_API ut64 r_bin_java_bootstrap_method_calc_size(RBinJavaBootStrapMethod *bsm);
R_API ut64 r_bin_java_element_pair_calc_size(RBinJavaElementValuePair *ev_pair);
R_API ut64 r_bin_java_element_value_calc_size(RBinJavaElementValue *element_value);
R_API ut64 r_bin_java_unknown_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_class_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_fieldref_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_methodref_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_interfacemethodref_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_name_and_type_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_string_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_integer_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_float_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_long_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_double_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_utf8_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_do_nothing_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_methodhandle_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_methodtype_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API ut64 r_bin_java_invokedynamic_cp_calc_size(RBinJavaCPTypeObj* obj);
R_API RBinJavaStackMapFrame* r_bin_java_default_stack_frame();
R_API RList * r_bin_java_find_cp_const_by_val_float (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len);
R_API RList * r_bin_java_find_cp_const_by_val_double (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len);
R_API RList * r_bin_java_find_cp_const_by_val_int (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len);
R_API RList * r_bin_java_find_cp_const_by_val_long (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len);
R_API RList * r_bin_java_find_cp_const_by_val_utf8 (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len);
R_API ut8 * r_bin_java_cp_append_classref_and_name (RBinJavaObj *bin, ut32 *out_sz, const char *classname, const ut32 classname_len);
R_API ut8 * U(r_bin_java_cp_append_ref_cname_fname_ftype) (RBinJavaObj *bin, ut32 *out_sz, ut8 tag, const char *cname, const ut32 c_len, const char *fname, const ut32 f_len, const char *tname, const ut32 t_len);
R_API ut8 * r_bin_java_cp_get_classref (RBinJavaObj *bin, ut32 *out_sz, const char *classname, const ut32 classname_len, const ut16 name_idx);
R_API ut8 * U(r_bin_java_cp_get_method_ref) (RBinJavaObj *bin, ut32 *out_sz, ut16 class_idx, ut16 name_and_type_idx);
R_API ut8 * U(r_bin_java_cp_get_field_ref) (RBinJavaObj *bin, ut32 *out_sz, ut16 class_idx, ut16 name_and_type_idx);
R_API ut8 * r_bin_java_cp_get_fm_ref (RBinJavaObj *bin, ut32 *out_sz, ut8 tag, ut16 class_idx, ut16 name_and_type_idx);
R_API ut8 * r_bin_java_cp_get_2_ut16 (RBinJavaObj *bin, ut32 *out_sz, ut8 tag, ut16 ut16_one, ut16 ut16_two);
R_API ut8 * r_bin_java_cp_get_name_type (RBinJavaObj *bin, ut32 *out_sz, ut16 name_idx, ut16 type_idx);
2014-06-25 02:11:43 +00:00
R_API char * convert_string (const char * bytes, ut32 len) {
ut32 idx = 0, pos = 0;
ut32 str_sz = 4*len+1;
char *cpy_buffer = len > 0 ? malloc (str_sz): NULL;
if (!cpy_buffer) return cpy_buffer;
// 4x is the increase from byte to \xHH where HH represents hexed byte
memset (cpy_buffer, 0, str_sz);
2015-10-25 15:35:47 +00:00
while (idx < len && pos < len) {
if (dso_json_char_needs_hexing (bytes[idx])) {
2015-10-29 19:02:13 +00:00
if (pos + 2 < len) {
free (cpy_buffer);
return NULL;
}
sprintf (cpy_buffer+pos, "\\x%02x", bytes[idx]);
pos += 4;
} else {
cpy_buffer[pos] = bytes[idx];
pos++;
}
idx ++;
}
return cpy_buffer;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// taken from LLVM Code Byte Swap
2013-10-23 22:27:07 +00:00
// TODO: move into r_util
2014-06-25 02:11:43 +00:00
R_API ut32 U(r_bin_java_swap_uint)(ut32 x) {
const ut32 Byte0 = x & 0x000000FF;
const ut32 Byte1 = x & 0x0000FF00;
const ut32 Byte2 = x & 0x00FF0000;
const ut32 Byte3 = x & 0xFF000000;
return (Byte0 << 24) | (Byte1 << 8) | (Byte2 >> 8) | (Byte3 >> 24);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
static bool R_BIN_JAVA_NULL_TYPE_INITTED = false;
// XXX - this is a global variable used while parsing the class file
// if multi-threaded class parsing is enabled, this variable needs to
// be guarded with a lock.
2015-10-25 15:35:47 +00:00
static RBinJavaObj* R_BIN_JAVA_GLOBAL_BIN = NULL;
static RBinJavaAccessFlags FIELD_ACCESS_FLAGS[] = {
{"public", R_BIN_JAVA_FIELD_ACC_PUBLIC, 6},
{"private", R_BIN_JAVA_FIELD_ACC_PRIVATE, 7},
{"protected", R_BIN_JAVA_FIELD_ACC_PROTECTED, 9},
{"static", R_BIN_JAVA_FIELD_ACC_STATIC, 6},
{"final", R_BIN_JAVA_FIELD_ACC_FINAL, 5},
{"undefined.0x0020", 0x0020, 16},
{"volatile", R_BIN_JAVA_FIELD_ACC_VOLATILE, 8},
{"transient", R_BIN_JAVA_FIELD_ACC_TRANSIENT, 9},
{"undefined.0x0100", 0x0100, 16},
{"undefined.0x0200", 0x0200, 16},
{"undefined.0x0400", 0x0400, 16},
{"undefined.0x0800", 0x0800, 16},
{"synthetic", R_BIN_JAVA_FIELD_ACC_SYNTHETIC, 9},
{"undefined.0x2000", 0x2000, 16},
{"enum", R_BIN_JAVA_FIELD_ACC_ENUM, 16},
{"undefined.0x8000", 0x8000, 16},
{NULL, 0, 0}
};
static RBinJavaAccessFlags METHOD_ACCESS_FLAGS[] = {
{"public", R_BIN_JAVA_METHOD_ACC_PUBLIC, 6},
{"private", R_BIN_JAVA_METHOD_ACC_PRIVATE, 7},
{"protected", R_BIN_JAVA_METHOD_ACC_PROTECTED, 9},
{"static", R_BIN_JAVA_METHOD_ACC_STATIC, 6},
{"final", R_BIN_JAVA_METHOD_ACC_FINAL, 5},
{"synchronized", R_BIN_JAVA_METHOD_ACC_SYNCHRONIZED, 12},
{"bridge", R_BIN_JAVA_METHOD_ACC_BRIDGE, 6},
{"varargs", R_BIN_JAVA_METHOD_ACC_VARARGS, 7},
{"native", R_BIN_JAVA_METHOD_ACC_NATIVE, 6},
{"interface", R_BIN_JAVA_METHOD_ACC_INTERFACE, 9},
{"abstract", R_BIN_JAVA_METHOD_ACC_ABSTRACT, 8},
{"strict", R_BIN_JAVA_METHOD_ACC_STRICT, 6},
{"synthetic", R_BIN_JAVA_METHOD_ACC_SYNTHETIC, 9},
{"annotation", R_BIN_JAVA_METHOD_ACC_ANNOTATION, 10},
{"enum", R_BIN_JAVA_METHOD_ACC_ENUM, 4},
{"undefined.0x8000", 0x8000, 16},
{NULL, 0, 0}
};
// XXX - Fix these there are some incorrect ongs
static RBinJavaAccessFlags CLASS_ACCESS_FLAGS[] = {
{"public", R_BIN_JAVA_CLASS_ACC_PUBLIC, 6},
{"undefined.0x0002", 0x0002, 16},
{"undefined.0x0004", 0x0004, 16},
{"undefined.0x0008", 0x0008, 16},
{"final", R_BIN_JAVA_CLASS_ACC_FINAL, 5},
{"super", R_BIN_JAVA_CLASS_ACC_SUPER, 5},
{"undefined.0x0040", 0x0040, 16},
{"undefined.0x0080", 0x0080, 16},
{"undefined.0x0100", 0x0100, 16},
{"interface", R_BIN_JAVA_CLASS_ACC_INTERFACE, 9},
{"abstract", R_BIN_JAVA_CLASS_ACC_ABSTRACT, 8},
{"undefined.0x0800", 0x0800, 16},
{"synthetic", R_BIN_JAVA_CLASS_ACC_SYNTHETIC, 9},
{"annotation", R_BIN_JAVA_CLASS_ACC_ANNOTATION, 10},
{"enum", R_BIN_JAVA_CLASS_ACC_ENUM, 4},
{"undefined.0x8000", 0x8000, 16},
{NULL, 0, 0}
};
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
static RBinJavaRefMetas R_BIN_JAVA_REF_METAS[] = {
{"Unknown", R_BIN_JAVA_REF_UNKNOWN},
{"GetField", R_BIN_JAVA_REF_GETFIELD},
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{"GetStatic", R_BIN_JAVA_REF_GETSTATIC},
{"PutField", R_BIN_JAVA_REF_PUTFIELD},
{"PutStatic", R_BIN_JAVA_REF_PUTSTATIC},
{"InvokeVirtual", R_BIN_JAVA_REF_INVOKEVIRTUAL},
{"InvokeStatic", R_BIN_JAVA_REF_INVOKESTATIC},
{"InvokeSpecial", R_BIN_JAVA_REF_INVOKESPECIAL},
{"NewInvokeSpecial", R_BIN_JAVA_REF_NEWINVOKESPECIAL},
{"InvokeInterface", R_BIN_JAVA_REF_INVOKEINTERFACE}
};
static ut16 R_BIN_JAVA_ELEMENT_VALUE_METAS_SZ = 14;
static RBinJavaElementValueMetas R_BIN_JAVA_ELEMENT_VALUE_METAS[] = {
{"Byte", R_BIN_JAVA_EV_TAG_BYTE, NULL},
{"Char", R_BIN_JAVA_EV_TAG_CHAR, NULL},
{"Double", R_BIN_JAVA_EV_TAG_DOUBLE, NULL},
{"Float", R_BIN_JAVA_EV_TAG_FLOAT, NULL},
{"Integer", R_BIN_JAVA_EV_TAG_INT, NULL},
{"Long", R_BIN_JAVA_EV_TAG_LONG, NULL},
{"Short", R_BIN_JAVA_EV_TAG_SHORT, NULL},
{"Boolean", R_BIN_JAVA_EV_TAG_BOOLEAN, NULL},
{"Array of ", R_BIN_JAVA_EV_TAG_ARRAY, NULL},
{"String", R_BIN_JAVA_EV_TAG_STRING, NULL},
{"Enum", R_BIN_JAVA_EV_TAG_ENUM, NULL},
{"Class", R_BIN_JAVA_EV_TAG_CLASS, NULL},
{"Annotation", R_BIN_JAVA_EV_TAG_ANNOTATION, NULL},
{"Unknown", R_BIN_JAVA_EV_TAG_UNKNOWN, NULL},
};
static RBinJavaVerificationMetas R_BIN_JAVA_VERIFICATION_METAS[] = {
{"Top", R_BIN_JAVA_STACKMAP_TOP},
{"Integer", R_BIN_JAVA_STACKMAP_INTEGER},
{"Float", R_BIN_JAVA_STACKMAP_FLOAT},
{"Double", R_BIN_JAVA_STACKMAP_DOUBLE},
{"Long", R_BIN_JAVA_STACKMAP_LONG},
{"NULL", R_BIN_JAVA_STACKMAP_NULL},
{"This", R_BIN_JAVA_STACKMAP_THIS},
{"Object", R_BIN_JAVA_STACKMAP_OBJECT},
{"Uninitialized", R_BIN_JAVA_STACKMAP_UNINIT},
{"Unknown", R_BIN_JAVA_STACKMAP_UNKNOWN}
};
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
static RBinJavaStackMapFrameMetas R_BIN_JAVA_STACK_MAP_FRAME_METAS[] = {
{"ImplicitStackFrame", R_BIN_JAVA_STACK_FRAME_IMPLICIT, NULL},
{"Same", R_BIN_JAVA_STACK_FRAME_SAME, NULL},
{"SameLocals1StackItem", R_BIN_JAVA_STACK_FRAME_SAME_LOCALS_1, NULL},
{"Chop", R_BIN_JAVA_STACK_FRAME_CHOP, NULL},
{"SameFrameExtended", R_BIN_JAVA_STACK_FRAME_SAME_FRAME_EXTENDED, NULL},
{"Append", R_BIN_JAVA_STACK_FRAME_APPEND, NULL},
{"FullFrame", R_BIN_JAVA_STACK_FRAME_FULL_FRAME, NULL},
{"Reserved", R_BIN_JAVA_STACK_FRAME_RESERVED, NULL}
};
2014-06-25 02:11:43 +00:00
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
static RBinJavaCPTypeObjectAllocs R_BIN_ALLOCS_CONSTANTS[]= {
{r_bin_java_do_nothing_new, r_bin_java_do_nothing_free, r_bin_java_print_null_cp_summary, r_bin_java_do_nothing_calc_size, r_bin_java_print_null_cp_stringify},
{r_bin_java_utf8_cp_new, r_bin_java_utf8_info_free, r_bin_java_print_utf8_cp_summary, r_bin_java_utf8_cp_calc_size, r_bin_java_print_utf8_cp_stringify},
{r_bin_java_unknown_cp_new, r_bin_java_default_free, r_bin_java_print_unknown_cp_summary, r_bin_java_unknown_cp_calc_size, r_bin_java_print_unknown_cp_stringify},
{r_bin_java_integer_cp_new, r_bin_java_default_free, r_bin_java_print_integer_cp_summary, r_bin_java_integer_cp_calc_size, r_bin_java_print_integer_cp_stringify},
{r_bin_java_float_cp_new, r_bin_java_default_free, r_bin_java_print_float_cp_summary, r_bin_java_float_cp_calc_size, r_bin_java_print_float_cp_stringify},
{r_bin_java_long_cp_new, r_bin_java_default_free, r_bin_java_print_long_cp_summary, r_bin_java_long_cp_calc_size, r_bin_java_print_long_cp_stringify},
{r_bin_java_double_cp_new, r_bin_java_default_free, r_bin_java_print_double_cp_summary, r_bin_java_double_cp_calc_size, r_bin_java_print_double_cp_stringify},
{r_bin_java_class_cp_new, r_bin_java_default_free, r_bin_java_print_classref_cp_summary, r_bin_java_class_cp_calc_size, r_bin_java_print_classref_cp_stringify},
{r_bin_java_string_cp_new, r_bin_java_default_free, r_bin_java_print_string_cp_summary, r_bin_java_string_cp_calc_size, r_bin_java_print_string_cp_stringify},
{r_bin_java_fieldref_cp_new, r_bin_java_default_free, r_bin_java_print_fieldref_cp_summary, r_bin_java_fieldref_cp_calc_size, r_bin_java_print_fieldref_cp_stringify},
{r_bin_java_methodref_cp_new, r_bin_java_default_free, r_bin_java_print_methodref_cp_summary, r_bin_java_methodref_cp_calc_size, r_bin_java_print_methodref_cp_stringify},
{r_bin_java_interfacemethodref_cp_new, r_bin_java_default_free, r_bin_java_print_interfacemethodref_cp_summary, r_bin_java_interfacemethodref_cp_calc_size, r_bin_java_print_interfacemethodref_cp_stringify},
{r_bin_java_name_and_type_cp_new, r_bin_java_default_free, r_bin_java_print_name_and_type_cp_summary, r_bin_java_name_and_type_cp_calc_size, r_bin_java_print_name_and_type_cp_stringify},
{NULL, NULL, NULL, NULL, NULL},
{NULL, NULL, NULL, NULL, NULL},
{r_bin_java_methodhandle_cp_new, r_bin_java_default_free, r_bin_java_print_methodhandle_cp_summary, r_bin_java_methodhandle_cp_calc_size, r_bin_java_print_methodhandle_cp_stringify},
{r_bin_java_methodtype_cp_new, r_bin_java_default_free, r_bin_java_print_methodtype_cp_summary, r_bin_java_methodtype_cp_calc_size, r_bin_java_print_methodtype_cp_stringify},
{NULL, NULL, NULL, NULL, NULL},
{r_bin_java_invokedynamic_cp_new, r_bin_java_default_free, r_bin_java_print_invokedynamic_cp_summary, r_bin_java_invokedynamic_cp_calc_size, r_bin_java_print_invokedynamic_cp_stringify},
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
};
static RBinJavaCPTypeObj R_BIN_JAVA_NULL_TYPE;
static ut8 R_BIN_JAVA_CP_METAS_SZ = 12;
static RBinJavaCPTypeMetas R_BIN_JAVA_CP_METAS[] = {
// Each field has a name pointer and a tag field
{ "NULL", R_BIN_JAVA_CP_NULL, 0, &R_BIN_ALLOCS_CONSTANTS[0] },
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{ "Utf8", R_BIN_JAVA_CP_UTF8, 3, &R_BIN_ALLOCS_CONSTANTS[1] }, // 2 bytes = length, N bytes string (containts a pointer in the field)
{ "Unknown", R_BIN_JAVA_CP_UNKNOWN, 0, &R_BIN_ALLOCS_CONSTANTS[2] },
{ "Integer", R_BIN_JAVA_CP_INTEGER, 5, &R_BIN_ALLOCS_CONSTANTS[3] }, // 4 bytes
{ "Float", R_BIN_JAVA_CP_FLOAT, 5, &R_BIN_ALLOCS_CONSTANTS[4] }, // 4 bytes
{ "Long", R_BIN_JAVA_CP_LONG, 9, &R_BIN_ALLOCS_CONSTANTS[5] }, // 4 high 4 low
{ "Double", R_BIN_JAVA_CP_DOUBLE, 9, &R_BIN_ALLOCS_CONSTANTS[6] }, // 4 high 4 low
{ "Class", R_BIN_JAVA_CP_CLASS, 3, &R_BIN_ALLOCS_CONSTANTS[7] }, // 2 name_idx
{ "String", R_BIN_JAVA_CP_STRING, 3, &R_BIN_ALLOCS_CONSTANTS[8] }, // 2 string_idx
{ "FieldRef", R_BIN_JAVA_CP_FIELDREF, 5, &R_BIN_ALLOCS_CONSTANTS[9] }, // 2 class idx, 2 name/type_idx
{ "MethodRef", R_BIN_JAVA_CP_METHODREF, 5, &R_BIN_ALLOCS_CONSTANTS[10] }, // 2 class idx, 2 name/type_idx
{ "InterfaceMethodRef", R_BIN_JAVA_CP_INTERFACEMETHOD_REF, 5 , &R_BIN_ALLOCS_CONSTANTS[11] }, // 2 class idx, 2 name/type_idx
{ "NameAndType", R_BIN_JAVA_CP_NAMEANDTYPE, 5, &R_BIN_ALLOCS_CONSTANTS[12] }, // 4 high 4 low
{ "Unknown", R_BIN_JAVA_CP_UNKNOWN, 0, &R_BIN_ALLOCS_CONSTANTS[2] },
{ "Unknown", R_BIN_JAVA_CP_UNKNOWN, 0, &R_BIN_ALLOCS_CONSTANTS[2] },
{ "MethodHandle", R_BIN_JAVA_CP_METHODHANDLE, 4, &R_BIN_ALLOCS_CONSTANTS[15] }, // 4 high 4 low
{ "MethodType", R_BIN_JAVA_CP_METHODTYPE, 3, &R_BIN_ALLOCS_CONSTANTS[16] }, // 4 high 4 low
{ "Unknown", R_BIN_JAVA_CP_UNKNOWN, 0, &R_BIN_ALLOCS_CONSTANTS[2] },
{ "InvokeDynamic", R_BIN_JAVA_CP_INVOKEDYNAMIC, 5, &R_BIN_ALLOCS_CONSTANTS[18] }, // 4 high 4 low
};
static RBinJavaAttrInfoObjectAllocs RBIN_JAVA_ATTRS_ALLOCS[] = {
{ r_bin_java_annotation_default_attr_new, r_bin_java_annotation_default_attr_free, r_bin_java_print_annotation_default_attr_summary, r_bin_java_annotation_default_attr_calc_size },
{ r_bin_java_bootstrap_methods_attr_new, r_bin_java_bootstrap_methods_attr_free, r_bin_java_print_bootstrap_methods_attr_summary, r_bin_java_bootstrap_methods_attr_calc_size },
{ r_bin_java_code_attr_new, r_bin_java_code_attr_free, r_bin_java_print_code_attr_summary, r_bin_java_code_attr_calc_size },
{ r_bin_java_constant_value_attr_new, r_bin_java_constant_value_attr_free, r_bin_java_print_constant_value_attr_summary, r_bin_java_constant_value_attr_calc_size},
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{ r_bin_java_deprecated_attr_new, r_bin_java_deprecated_attr_free, r_bin_java_print_deprecated_attr_summary, r_bin_java_deprecated_attr_calc_size },
{ r_bin_java_enclosing_methods_attr_new, r_bin_java_enclosing_methods_attr_free, r_bin_java_print_enclosing_methods_attr_summary, r_bin_java_enclosing_methods_attr_calc_size },
{ r_bin_java_exceptions_attr_new, r_bin_java_exceptions_attr_free, r_bin_java_print_exceptions_attr_summary, r_bin_java_exceptions_attr_calc_size },
{ r_bin_java_inner_classes_attr_new, r_bin_java_inner_classes_attr_free, r_bin_java_print_inner_classes_attr_summary, r_bin_java_inner_classes_attr_calc_size },
{ r_bin_java_line_number_table_attr_new, r_bin_java_line_number_table_attr_free, r_bin_java_print_line_number_table_attr_summary, r_bin_java_line_number_table_attr_calc_size },
{ r_bin_java_local_variable_table_attr_new, r_bin_java_local_variable_table_attr_free, r_bin_java_print_local_variable_table_attr_summary, r_bin_java_local_variable_table_attr_calc_size },
{ r_bin_java_local_variable_type_table_attr_new, r_bin_java_local_variable_type_table_attr_free, r_bin_java_print_local_variable_type_table_attr_summary, r_bin_java_local_variable_type_table_attr_calc_size },
{ r_bin_java_rti_annotations_attr_new, r_bin_java_rti_annotations_attr_free, r_bin_java_print_rti_annotations_attr_summary, r_bin_java_rti_annotations_attr_calc_size },
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{ r_bin_java_rtip_annotations_attr_new, r_bin_java_rtip_annotations_attr_free, r_bin_java_print_rtip_annotations_attr_summary, r_bin_java_rtip_annotations_attr_calc_size },
{ r_bin_java_rtv_annotations_attr_new, r_bin_java_rtv_annotations_attr_free, r_bin_java_print_rtv_annotations_attr_summary,r_bin_java_rtv_annotations_attr_calc_size },
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{ r_bin_java_rtvp_annotations_attr_new, r_bin_java_rtvp_annotations_attr_free, r_bin_java_print_rtvp_annotations_attr_summary, r_bin_java_rtvp_annotations_attr_calc_size },
{ r_bin_java_signature_attr_new, r_bin_java_signature_attr_free, r_bin_java_print_signature_attr_summary, r_bin_java_signature_attr_calc_size },
{ r_bin_java_source_debug_attr_new, r_bin_java_source_debug_attr_free, r_bin_java_print_source_debug_attr_summary, r_bin_java_source_debug_attr_calc_size },
{ r_bin_java_source_code_file_attr_new, r_bin_java_source_code_file_attr_free, r_bin_java_print_source_code_file_attr_summary, r_bin_java_source_code_file_attr_calc_size },
{ r_bin_java_stack_map_table_attr_new, r_bin_java_stack_map_table_attr_free, r_bin_java_print_stack_map_table_attr_summary, r_bin_java_stack_map_table_attr_calc_size },
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{ r_bin_java_synthetic_attr_new, r_bin_java_synthetic_attr_free, r_bin_java_print_synthetic_attr_summary, r_bin_java_synthetic_attr_calc_size },
{ r_bin_java_unknown_attr_new, r_bin_java_unknown_attr_free, r_bin_java_print_unknown_attr_summary, r_bin_java_unknown_attr_calc_size}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
};
2014-06-25 02:11:43 +00:00
//R_API ut32 RBIN_JAVA_ATTRS_METAS_SZ = 21;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
static ut32 RBIN_JAVA_ATTRS_METAS_SZ = 20;
static RBinJavaAttrMetas RBIN_JAVA_ATTRS_METAS[] = {
{ "AnnotationDefault", R_BIN_JAVA_ATTR_TYPE_ANNOTATION_DEFAULT_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[0]},
{ "BootstrapMethods", R_BIN_JAVA_ATTR_TYPE_BOOTSTRAP_METHODS_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[1]},
{ "Code", R_BIN_JAVA_ATTR_TYPE_CODE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[2]},
{ "ConstantValue", R_BIN_JAVA_ATTR_TYPE_CONST_VALUE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[3]},
{ "Deperecated", R_BIN_JAVA_ATTR_TYPE_DEPRECATED_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[4]},
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{ "EnclosingMethod", R_BIN_JAVA_ATTR_TYPE_ENCLOSING_METHOD_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[5]},
{ "Exceptions", R_BIN_JAVA_ATTR_TYPE_EXCEPTIONS_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[6]},
{ "InnerClasses", R_BIN_JAVA_ATTR_TYPE_INNER_CLASSES_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[7]},
{ "LineNumberTable", R_BIN_JAVA_ATTR_TYPE_LINE_NUMBER_TABLE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[8]},
{ "LocalVariableTable", R_BIN_JAVA_ATTR_TYPE_LOCAL_VARIABLE_TABLE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[9]},
{ "LocalVariableTypeTable", R_BIN_JAVA_ATTR_TYPE_LOCAL_VARIABLE_TYPE_TABLE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[10]},
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{ "RuntimeInvisibleAnnotations", R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_ANNOTATION_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[11]},
{ "RuntimeInvisibleParameterAnnotations", R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATION_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[12]},
{ "RuntimeVisibleAnnotations", R_BIN_JAVA_ATTR_TYPE_RUNTIME_VISIBLE_ANNOTATION_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[13]},
{ "RuntimeVisibleParameterAnnotations", R_BIN_JAVA_ATTR_TYPE_RUNTIME_VISIBLE_PARAMETER_ANNOTATION_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[14]},
{ "Signature", R_BIN_JAVA_ATTR_TYPE_SIGNATURE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[15]},
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
{ "SourceDebugExtension", R_BIN_JAVA_ATTR_TYPE_SOURCE_DEBUG_EXTENTSION_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[16]},
{ "SourceFile", R_BIN_JAVA_ATTR_TYPE_SOURCE_FILE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[17]},
{ "StackMapTable", R_BIN_JAVA_ATTR_TYPE_STACK_MAP_TABLE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[18]},
//{ "StackMap", R_BIN_JAVA_ATTR_TYPE_STACK_MAP_TABLE_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[18]},
{ "Synthetic", R_BIN_JAVA_ATTR_TYPE_SYNTHETIC_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[19]},
{ "Unknown", R_BIN_JAVA_ATTR_TYPE_UNKNOWN_ATTR, &RBIN_JAVA_ATTRS_ALLOCS[20]}
};
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_reset_bin_info (RBinJavaObj *bin) {
2014-03-30 17:29:29 +00:00
free (bin->cf2.flags_str);
free (bin->cf2.this_class_name);
r_list_free (bin->imports_list);
r_list_free (bin->methods_list);
r_list_free (bin->fields_list);
r_list_free (bin->attrs_list);
r_list_free (bin->cp_list);
r_list_free (bin->interfaces_list);
memset (bin, 0, sizeof (RBinJavaObj));
bin->cf2.flags_str = strdup ("unknown");
bin->cf2.this_class_name = strdup ("unknown");
bin->imports_list = r_list_newf (free);
2014-04-05 04:16:17 +00:00
bin->methods_list = r_list_newf (r_bin_java_fmtype_free);
bin->fields_list = r_list_newf (r_bin_java_fmtype_free);
bin->attrs_list = r_list_newf (r_bin_java_attribute_free);
bin->cp_list = r_list_newf (r_bin_java_constant_pool);
bin->interfaces_list = r_list_newf (r_bin_java_interface_free);
2014-03-30 17:29:29 +00:00
}
2014-06-25 02:11:43 +00:00
R_API char * r_bin_java_unmangle_method (const char *flags, const char *name, const char *params, const char *r_value) {
RList *the_list = params ? r_bin_java_extract_type_values (params) : r_list_new ();
RListIter *iter = NULL;
// second case removes leading space if no flags are given
const char *fmt = flags ? "%s %s %s (%s)" : "%s%s %s (%s)";
char *str = NULL, *f_val_str = NULL, *r_val_str = NULL, *prototype = NULL, *p_val_str = NULL;
ut32 params_idx = 0, params_len = 0, prototype_len = 0;
2015-11-24 17:26:10 +00:00
if (!extract_type_value (r_value, &r_val_str)) {
r_list_free (the_list);
return NULL;
2015-11-24 17:26:10 +00:00
}
if (!r_val_str) r_val_str = strdup ("UNKNOWN");
f_val_str = strdup (flags? flags: "");
params_idx = 0;
r_list_foreach (the_list, iter, str) {
params_len += strlen (str);
if (params_idx > 0) params_len += 2;
params_idx++;
}
if (params_len > 0) {
ut32 offset = 0;
params_len += 1;
p_val_str = malloc (params_len);
params_idx = 0;
r_list_foreach (the_list, iter, str) {
if (offset != 0) {
offset += snprintf (p_val_str+offset, params_len - offset, ", %s", str);
} else {
offset += snprintf (p_val_str+offset, params_len - offset, "%s", str);
}
}
} else {
p_val_str = strdup ("");
}
2014-07-30 20:13:55 +00:00
prototype_len += (flags ? strlen(flags) + 1 : 0); // space vs no space
prototype_len += strlen(name) + 1; // name + space
prototype_len += strlen(r_val_str) + 1; // r_value + space
prototype_len += strlen (p_val_str) + 3; // space + l_paren + params + r_paren
prototype_len += 1; // null
prototype = malloc(prototype_len);
/// TODO enable this function and start using it to demangle strings
snprintf (prototype, prototype_len, fmt, f_val_str, r_val_str, name, p_val_str);
free (f_val_str);
free (r_val_str);
free (p_val_str);
r_list_free (the_list);
return prototype;
}
R_API char * r_bin_java_unmangle (const char *flags, const char *name, const char *descriptor) {
ut32 l_paren_pos = -1, r_paren_pos = -1;
char *result = NULL;
ut32 desc_len = descriptor && *descriptor ? strlen (descriptor) : 0,
name_len = name && *name ? strlen (name) : 0,
flags_len = flags && *flags ? strlen (flags) : 0,
i = 0;
if (desc_len == 0 || name == 0) return NULL;
for (i = 0; i < desc_len; i++) {
if (descriptor[i] == '(') {
l_paren_pos = i;
} else if (l_paren_pos != (ut32)-1 && descriptor[i] == ')') {
r_paren_pos = i;
break;
}
}
// handle field case;
if (l_paren_pos == (ut32) -1 && r_paren_pos == (ut32) -1) {
char *unmangle_field_desc = NULL;
ut32 len = extract_type_value (descriptor, &unmangle_field_desc);
if (len == 0) {
eprintf ("Warning: attempting to unmangle invalid type descriptor.\n");
free (unmangle_field_desc);
return result;
}
if (flags_len > 0) {
len += (flags_len + name_len + 5); // space and null
result = malloc (len);
snprintf (result, len, "%s %s %s", flags, unmangle_field_desc, name);
} else {
len += (name_len + 5); // space and null
result = malloc (len);
snprintf (result, len, "%s %s", unmangle_field_desc, name);
}
free (unmangle_field_desc);
} else if (l_paren_pos != (ut32) -1 &&
r_paren_pos != (ut32) -1 &&
l_paren_pos < r_paren_pos) {
// params_len account for l_paren + 1 and null
ut32 params_len = r_paren_pos - (l_paren_pos+1) != 0 ? r_paren_pos - (l_paren_pos + 1) + 1 : 0;
char *params = params_len ? malloc (params_len) : NULL;
const char *rvalue = descriptor+r_paren_pos+1;
if (params)
snprintf (params, params_len, "%s", descriptor+l_paren_pos+1);
result = r_bin_java_unmangle_method (flags, name, params, rvalue);
free (params);
}
return result;
}
R_API DsoJsonObj * r_bin_java_get_bin_obj_json (RBinJavaObj *bin) {
DsoJsonObj *imports_list = r_bin_java_get_import_json_definitions (bin);
DsoJsonObj *fields_list = r_bin_java_get_field_json_definitions (bin);
DsoJsonObj *methods_list = r_bin_java_get_method_json_definitions (bin);
//interfaces_list = r_bin_java_get_interface_json_definitions (bin);
DsoJsonObj *class_dict = r_bin_java_get_class_info_json (bin);
char *res = dso_json_obj_to_str (methods_list);
//eprintf ("Resulting methods json: \n%s\n", res);
free (res);
dso_json_dict_insert_str_key_obj (class_dict, "methods", methods_list);
//dso_json_list_free (methods_list);
dso_json_obj_del (methods_list);
res = dso_json_obj_to_str (fields_list);
//eprintf ("Resulting fields json: \n%s\n", res);
free (res);
dso_json_dict_insert_str_key_obj (class_dict, "fields", fields_list);
//dso_json_list_free (fields_list);
dso_json_obj_del (fields_list);
res = dso_json_obj_to_str (imports_list);
//eprintf ("Resulting imports json: \n%s\n", res);
free (res);
dso_json_dict_insert_str_key_obj (class_dict, "imports", imports_list);
//dso_json_list_free (imports_list);
dso_json_obj_del (imports_list);
//res = dso_json_obj_to_str (interfaces_list);
//eprintf ("Resulting interfaces json: \n%s\n", res);
//free (res);
//dso_json_dict_insert_str_key_obj (class_dict, "interfaces", interfaces_list);
res = dso_json_obj_to_str (class_dict);
//eprintf ("Resulting class info json: \n%s\n", res);
free (res);
//dso_json_obj_del (class_dict);
return class_dict;
}
R_API DsoJsonObj * r_bin_java_get_import_json_definitions(RBinJavaObj *bin) {
2015-02-11 18:04:16 +00:00
RList *the_list;
DsoJsonObj *json_list = dso_json_list_new ();
RListIter *iter = NULL;
char *new_str;
2015-02-11 18:04:16 +00:00
2015-02-16 23:34:51 +00:00
if (!bin || !(the_list = r_bin_java_get_lib_names (bin)))
2015-02-11 18:04:16 +00:00
return json_list;
r_list_foreach (the_list, iter, new_str) {
char *tmp = new_str;
//eprintf ("Processing string: %s\n", new_str);
while (*tmp) {
2015-02-11 18:04:16 +00:00
if (*tmp == '/')
*tmp = '.';
tmp ++;
}
//eprintf ("adding string: %s\n", new_str);
dso_json_list_append_str (json_list, new_str);
}
r_list_free (the_list);
return json_list;
}
R_API DsoJsonObj * r_bin_java_get_class_info_json(RBinJavaObj *bin) {
RList *classes = r_bin_java_get_classes (bin);
DsoJsonObj *interfaces_list = dso_json_list_new ();
DsoJsonObj *class_info_dict = dso_json_dict_new ();
RBinClass *class_ = r_list_get_n (classes, 0);
if (class_) {
int dummy = 0;
RListIter *iter;
RBinClass *class_v = NULL;
// add access flags like in methods
bool is_public = ((class_->visibility & R_BIN_JAVA_CLASS_ACC_PUBLIC) != 0);
bool is_final = ((class_->visibility & R_BIN_JAVA_CLASS_ACC_FINAL) != 0);
bool is_super = ((class_->visibility & R_BIN_JAVA_CLASS_ACC_SUPER) != 0);
bool is_interface = ((class_->visibility & R_BIN_JAVA_CLASS_ACC_INTERFACE) != 0);
bool is_abstract = ((class_->visibility & R_BIN_JAVA_CLASS_ACC_ABSTRACT) != 0);
bool is_synthetic = ((class_->visibility & R_BIN_JAVA_CLASS_ACC_SYNTHETIC) != 0);
bool is_annotation = ((class_->visibility & R_BIN_JAVA_CLASS_ACC_ANNOTATION) != 0);
bool is_enum = ((class_->visibility & R_BIN_JAVA_CLASS_ACC_ENUM) != 0);
dso_json_dict_insert_str_key_num (class_info_dict, "access_flags", class_->visibility);
dso_json_dict_insert_str_key_num (class_info_dict, "is_public", is_public);
dso_json_dict_insert_str_key_num (class_info_dict, "is_final", is_final);
dso_json_dict_insert_str_key_num (class_info_dict, "is_super", is_super);
dso_json_dict_insert_str_key_num (class_info_dict, "is_interface", is_interface);
dso_json_dict_insert_str_key_num (class_info_dict, "is_abstract", is_abstract);
dso_json_dict_insert_str_key_num (class_info_dict, "is_synthetic", is_synthetic);
dso_json_dict_insert_str_key_num (class_info_dict, "is_annotation", is_annotation);
dso_json_dict_insert_str_key_num (class_info_dict, "is_enum", is_enum);
dso_json_dict_insert_str_key_str (class_info_dict, "name", class_->name);
if (!class_->super) {
DsoJsonObj *str = dso_json_str_new ();
dso_json_dict_insert_str_key_obj (class_info_dict, "super", str);
2015-06-02 20:59:30 +00:00
dso_json_str_free (str);
} else {
dso_json_dict_insert_str_key_str (class_info_dict, "super", class_->super);
}
r_list_foreach (classes, iter, class_v) {
if (!dummy) {
dummy++;
continue;
}
// enumerate all interface classes and append them to the interfaces
if ((class_v->visibility & R_BIN_JAVA_CLASS_ACC_INTERFACE) != 0) {
dso_json_list_append_str (interfaces_list, class_v->name);
}
}
}
dso_json_dict_insert_str_key_obj (class_info_dict, "interfaces", interfaces_list);
r_list_free (classes);
//dso_json_list_free (interfaces_list);
dso_json_obj_del (interfaces_list);
return class_info_dict;
}
R_API DsoJsonObj * r_bin_java_get_interface_json_definitions(RBinJavaObj *bin) {
2015-02-11 18:04:16 +00:00
RList *the_list;
DsoJsonObj *json_list = dso_json_list_new ();
RListIter *iter = NULL;
char *new_str;
2015-02-16 23:34:51 +00:00
if (!bin || !(the_list = r_bin_java_get_interface_names (bin)))
2015-02-11 18:04:16 +00:00
return json_list;
r_list_foreach (the_list, iter, new_str) {
char *tmp = new_str;
//eprintf ("Processing string: %s\n", new_str);
while (*tmp) {
if (*tmp == '/') *tmp = '.';
tmp ++;
}
//eprintf ("adding string: %s\n", new_str);
dso_json_list_append_str (json_list, new_str);
}
r_list_free (the_list);
return json_list;
}
R_API DsoJsonObj * r_bin_java_get_method_json_definitions(RBinJavaObj *bin) {
RBinJavaField *fm_type = NULL;
RListIter *iter = NULL;
DsoJsonObj *json_list = dso_json_list_new ();
if (!bin) return json_list;
r_list_foreach (bin->methods_list, iter, fm_type) {
DsoJsonObj *method_proto = r_bin_java_get_method_json_definition (bin, fm_type);
//eprintf ("Method json: %s\n", method_proto);
dso_json_list_append (json_list, method_proto);
}
return json_list;
}
R_API DsoJsonObj * r_bin_java_get_field_json_definitions(RBinJavaObj *bin) {
RBinJavaField *fm_type = NULL;
RListIter *iter = NULL;
DsoJsonObj *json_list = dso_json_list_new ();
if (!bin) return json_list;
r_list_foreach (bin->fields_list, iter, fm_type) {
DsoJsonObj *field_proto = r_bin_java_get_field_json_definition (bin, fm_type);
//eprintf ("Field json: %s\n", field_proto);
dso_json_list_append (json_list, field_proto);
}
return json_list;
}
R_API char * r_bin_java_create_method_fq_str(const char *klass, const char* name, const char *signature) {
if (!klass) klass = "null_class";
if (!name) name = "null_name";
if (!signature) signature = "null_signature";
return r_str_newf ("%s.%s.%s", klass, name, signature);
}
R_API char * r_bin_java_create_field_fq_str(const char *klass, const char* name, const char *signature) {
if (!klass) klass = "null_class";
if (!name) name = "null_name";
if (!signature) signature = "null_signature";
return r_str_newf ("%s %s.%s", signature, klass, name);
}
R_API DsoJsonObj * r_bin_java_get_fm_type_definition_json (RBinJavaObj *bin, RBinJavaField *fm_type, int is_method) {
ut64 addr = UT64_MAX;
char *prototype = NULL, *fq_name = NULL;
bool is_native = ((fm_type->flags & R_BIN_JAVA_METHOD_ACC_NATIVE) != 0);
bool is_static = ((fm_type->flags & R_BIN_JAVA_METHOD_ACC_STATIC) != 0);
bool is_synthetic = ((fm_type->flags & R_BIN_JAVA_METHOD_ACC_SYNTHETIC) != 0);
bool is_private = ((fm_type->flags & R_BIN_JAVA_METHOD_ACC_PRIVATE) != 0);
bool is_public = ((fm_type->flags & R_BIN_JAVA_METHOD_ACC_PUBLIC) != 0);
bool is_protected = ((fm_type->flags & R_BIN_JAVA_METHOD_ACC_PROTECTED) != 0);
bool is_super = ((fm_type->flags & R_BIN_JAVA_CLASS_ACC_SUPER) != 0);
DsoJsonObj *fm_type_dict = dso_json_dict_new ();
dso_json_dict_insert_str_key_num (fm_type_dict, "access_flags", fm_type->flags);
dso_json_dict_insert_str_key_num (fm_type_dict, "is_method", is_method);
dso_json_dict_insert_str_key_num (fm_type_dict, "is_native", is_native);
dso_json_dict_insert_str_key_num (fm_type_dict, "is_synthetic", is_synthetic);
dso_json_dict_insert_str_key_num (fm_type_dict, "is_private", is_private);
dso_json_dict_insert_str_key_num (fm_type_dict, "is_public", is_public);
dso_json_dict_insert_str_key_num (fm_type_dict, "is_static", is_static);
dso_json_dict_insert_str_key_num (fm_type_dict, "is_protected", is_protected);
dso_json_dict_insert_str_key_num (fm_type_dict, "is_super", is_super);
addr = r_bin_java_get_method_code_offset (fm_type);
if (addr == 0) addr = fm_type->file_offset;
addr += bin->loadaddr;
dso_json_dict_insert_str_key_num (fm_type_dict, "addr", addr);
dso_json_dict_insert_str_key_num (fm_type_dict, "offset", fm_type->file_offset+bin->loadaddr);
dso_json_dict_insert_str_key_str (fm_type_dict, "class_name", fm_type->class_name);
dso_json_dict_insert_str_key_str (fm_type_dict, "signature", fm_type->descriptor);
dso_json_dict_insert_str_key_str (fm_type_dict, "name", fm_type->name);
if (is_method) fq_name = r_bin_java_create_method_fq_str(fm_type->class_name, fm_type->name, fm_type->descriptor);
else fq_name = r_bin_java_create_field_fq_str(fm_type->class_name, fm_type->name, fm_type->descriptor);
dso_json_dict_insert_str_key_str (fm_type_dict, "fq_name", fq_name);
prototype = r_bin_java_unmangle (fm_type->flags_str, fm_type->name, fm_type->descriptor);
dso_json_dict_insert_str_key_str (fm_type_dict, "prototype", prototype);
free (prototype);
free (fq_name);
return fm_type_dict;
}
R_API char * r_bin_java_get_method_definition(RBinJavaField *fm_type) {
return r_bin_java_unmangle (fm_type->flags_str, fm_type->name, fm_type->descriptor);
}
R_API char * r_bin_java_get_field_definition(RBinJavaField *fm_type) {
return r_bin_java_unmangle (fm_type->flags_str, fm_type->name, fm_type->descriptor);
}
R_API DsoJsonObj * r_bin_java_get_method_json_definition(RBinJavaObj *bin, RBinJavaField *fm_type) {
return r_bin_java_get_fm_type_definition_json (bin, fm_type, 1);
}
R_API DsoJsonObj * r_bin_java_get_field_json_definition(RBinJavaObj *bin, RBinJavaField *fm_type) {
return r_bin_java_get_fm_type_definition_json (bin, fm_type, 0);
}
R_API int r_bin_java_extract_reference_name (const char * input_str, char ** ref_str, ut8 array_cnt) {
char *new_str = NULL;
ut32 str_len = array_cnt ? (array_cnt+1) * 2: 0 ;
const char *str_pos = input_str;
int consumed = 0, len = 0;
if (!str_pos || *str_pos != 'L' || !*str_pos) {
return -1;
}
consumed ++;
str_pos ++;
while (*str_pos && *str_pos != ';') {
str_pos++;
len++;
consumed++;
}
str_pos = input_str+1;
free (*ref_str);
str_len += len;
*ref_str = malloc (str_len+1);
new_str = *ref_str;
memcpy (new_str, input_str+1, str_len);
new_str[str_len] = 0;
while (*new_str) {
if (*new_str == '/') *new_str = '.';
new_str ++;
}
return len + 2;
}
2014-03-17 23:44:18 +00:00
R_API void UNUSED_FUNCTION(r_bin_java_print_prototypes) (RBinJavaObj *bin) {
RList *the_list = r_bin_java_get_method_definitions (bin);
RListIter *iter;
char *str;
r_list_foreach (the_list, iter, str) {
eprintf ("%s;\n", str);
}
2014-01-19 04:53:03 +00:00
r_list_free (the_list);
}
R_API char * get_type_value_str (const char *arg_str, ut8 array_cnt) {
ut32 str_len = array_cnt ? (array_cnt+1) * 2 + strlen (arg_str): strlen (arg_str) ;
char *str = malloc (str_len + 1);
ut32 bytes_written = snprintf (str, str_len+1, "%s", arg_str);
while (array_cnt > 0) {
bytes_written = snprintf (str+bytes_written, str_len - bytes_written, "[]");
array_cnt --;
}
return str;
}
2014-06-25 02:11:43 +00:00
R_API int extract_type_value (const char *arg_str, char **output) {
ut8 found_one = 0, array_cnt = 0;
ut32 len = 0, consumed = 0;
char *str = NULL;
if (!arg_str || !output) {
2014-01-22 22:58:23 +00:00
return 0;
}
if (output && *output && *output != NULL) {
free (*output);
2014-01-22 22:58:23 +00:00
*output = NULL;
}
while (arg_str && *arg_str && !found_one) {
len = 0;
// handle the end of an object
switch (*arg_str) {
2015-05-19 08:56:43 +00:00
case 'V':
len = 1;
str = get_type_value_str ("void", array_cnt);
break;
case 'J':
len = 1;
str = get_type_value_str ("long", array_cnt);
array_cnt = 0;
break;
case 'I':
len = 1;
str = get_type_value_str ("int", array_cnt);
array_cnt = 0;
break;
case 'D':
len = 1;
str = get_type_value_str ("double", array_cnt);
array_cnt = 0;
break;
case 'F':
len = 1;
str = get_type_value_str ("float", array_cnt);
array_cnt = 0;
break;
case 'B':
len = 1;
str = get_type_value_str ("byte", array_cnt);
array_cnt = 0;
break;
case 'C':
len = 1;
str = get_type_value_str ("char", array_cnt);
array_cnt = 0;
break;
case 'Z':
len = 1;
str = get_type_value_str ("boolean", array_cnt);
array_cnt = 0;
break;
case 'S':
len = 1;
str = get_type_value_str ("short", array_cnt);
array_cnt = 0;
break;
case '[': len = 1; array_cnt ++; break;
case 'L':
len = r_bin_java_extract_reference_name (arg_str, &str, array_cnt);
array_cnt = 0;
break;
case '(': len = 1; str = strdup ("("); break;
case ')': len = 1; str = strdup (")"); break;
2015-11-24 17:26:10 +00:00
default :
eprintf ("Invalid char '%c' in '%s'\n", *arg_str, arg_str);
return 0;
}
2015-05-19 08:56:43 +00:00
if (len<1)
break;
consumed += len;
arg_str += len;
if (str) {
*output = str;
break;
}
}
return consumed;
}
R_API RList * r_bin_java_extract_type_values(const char *arg_str) {
RList *list_args = r_list_new ();
char *str = NULL;
const char *str_cur_pos = NULL;
ut32 len = 0;
if (!arg_str) return list_args;
str_cur_pos = arg_str;
list_args->free = free;
while (str_cur_pos && *str_cur_pos) {
// handle the end of an object
len = extract_type_value (str_cur_pos, &str);
2015-11-24 17:26:10 +00:00
if (len < 1) {
r_list_free (list_args);
return NULL;
}
str_cur_pos += len;
r_list_append (list_args, str);
str = NULL;
}
return list_args;
}
2014-06-25 02:11:43 +00:00
R_API int r_bin_java_is_fm_type_private (RBinJavaField *fm_type) {
if (fm_type && fm_type->type == R_BIN_JAVA_FIELD_TYPE_METHOD)
return fm_type->flags & R_BIN_JAVA_METHOD_ACC_PRIVATE;
if (fm_type && fm_type->type == R_BIN_JAVA_FIELD_TYPE_FIELD)
return fm_type->flags & R_BIN_JAVA_FIELD_ACC_PRIVATE;
return 0;
}
2014-06-25 02:11:43 +00:00
R_API int r_bin_java_is_fm_type_protected (RBinJavaField *fm_type) {
if (fm_type && fm_type->type == R_BIN_JAVA_FIELD_TYPE_METHOD)
return fm_type->flags & R_BIN_JAVA_METHOD_ACC_PROTECTED;
if (fm_type && fm_type->type == R_BIN_JAVA_FIELD_TYPE_FIELD)
return fm_type->flags & R_BIN_JAVA_FIELD_ACC_PROTECTED;
return 0;
}
R_API RList * r_bin_java_get_args(RBinJavaField *fm_type) {
RList * the_list = r_bin_java_extract_type_values (fm_type->descriptor);
RList * arg_list = r_list_new ();
ut8 in_args = 0;
RListIter *desc_iter;
char *str;
r_list_foreach (the_list, desc_iter, str) {
2014-03-28 17:04:57 +00:00
if (str && *str == '(') {
in_args = 1;
continue;
}
if (str && *str == ')') break;
if (in_args) r_list_append (arg_list, strdup (str));
}
r_list_free (the_list);
return arg_list;
}
R_API RList * r_bin_java_get_ret(RBinJavaField *fm_type) {
RList * the_list = r_bin_java_extract_type_values (fm_type->descriptor);
RList * ret_list = r_list_new ();
ut8 in_ret = 0;
RListIter *desc_iter;
char *str;
r_list_foreach (the_list, desc_iter, str) {
if (str && *str != ')') in_ret = 0;
if (in_ret) {
r_list_append (ret_list, strdup(str));
}
}
r_list_free (the_list);
return ret_list;
}
R_API char * r_bin_java_get_this_class_name(RBinJavaObj *bin) {
return (bin->cf2.this_class_name ? strdup (bin->cf2.this_class_name): strdup ("unknown"));
}
R_API ut16 calculate_access_value(const char * access_flags_str, RBinJavaAccessFlags *access_flags) {
ut16 result = 0;
ut16 size = strlen(access_flags_str) + 1;
char *p_flags, *my_flags = malloc (size);
RBinJavaAccessFlags *iter = NULL;
if (size < 5 ||!my_flags) {
free (my_flags);
return result;
}
memcpy (my_flags, access_flags_str, size);
p_flags = strtok (my_flags, " ");
while (p_flags && access_flags) {
int idx = 0;
do {
iter = &access_flags[idx];
if (!iter || !iter->str) continue;
if (iter->len > 0 && iter->len != 16) {
if (!strncmp (iter->str, p_flags, iter->len))
result |= iter->value;
}
idx++;
}while (access_flags[idx].str != NULL);
p_flags = strtok (NULL," ");
}
free (my_flags);
return result;
}
2014-06-25 02:11:43 +00:00
R_API RList * retrieve_all_access_string_and_value (RBinJavaAccessFlags *access_flags) {
const char *fmt = "%s = 0x%04x";
RList *result = r_list_new ();
result->free = free;
int i = 0;
for (i = 0; access_flags[i].str != NULL; i++) {
char *str = malloc (50);
snprintf (str, 49, fmt, access_flags[i].str, access_flags[i].value);
r_list_append (result, str);
}
return result;
}
2014-06-25 02:11:43 +00:00
R_API char * retrieve_access_string(ut16 flags, RBinJavaAccessFlags *access_flags) {
char *outbuffer = NULL, *cur_pos = NULL;
ut16 i;
ut16 max_str_len = 0;
for (i = 0; access_flags[i].str != NULL; i++) {
2015-11-02 16:27:40 +00:00
if (flags & access_flags[i].value) {
max_str_len += (strlen (access_flags[i].str) + 1);
2015-11-02 16:27:40 +00:00
if (max_str_len < strlen (access_flags[i].str))
return NULL;
}
}
max_str_len++;
outbuffer = (char *) malloc (max_str_len);
if (outbuffer) {
memset (outbuffer, 0, max_str_len);
cur_pos = outbuffer;
for (i = 0; access_flags[i].str != NULL; i++) {
if (flags & access_flags[i].value) {
ut8 len = strlen (access_flags[i].str);
const char *the_string = access_flags[i].str;
memcpy (cur_pos, the_string, len);
memcpy (cur_pos+len, " ", 1);
cur_pos += len + 1;
}
}
if (cur_pos != outbuffer) *(cur_pos-1) = 0;
}
return outbuffer;
}
R_API char * retrieve_method_access_string(ut16 flags) {
return retrieve_access_string (flags, METHOD_ACCESS_FLAGS);
}
R_API char * retrieve_field_access_string(ut16 flags) {
return retrieve_access_string (flags, FIELD_ACCESS_FLAGS);
}
R_API char * retrieve_class_method_access_string(ut16 flags) {
return retrieve_access_string (flags, CLASS_ACCESS_FLAGS);
}
R_API char * r_bin_java_build_obj_key (RBinJavaObj *bin) {
char * jvcname = NULL;
char * cname = r_bin_java_get_this_class_name (bin);
ut32 class_name_len = cname ? strlen(cname) : strlen("_unknown_");
jvcname = malloc(class_name_len + 8+30);
if (cname) {
snprintf(jvcname, class_name_len + 30, "%d.%s.class", bin->id, cname);
free(cname);
} else {
snprintf(jvcname, class_name_len + 30, "%d._unknown_.class", bin->id);
}
return jvcname;
}
2014-06-25 02:11:43 +00:00
R_API int sdb_iterate_build_list(void *user, const char *k, const char *v) {
RList *bin_objs_list = (RList *) user;
size_t value = (size_t) sdb_atoi (v);
RBinJavaObj *bin_obj = NULL;
IFDBG eprintf("Found %s == %"PFMT64x" bin_objs db\n", k, (ut64)value);
if (value !=0 && value != (size_t)-1) {
bin_obj = (RBinJavaObj *) value;
r_list_append (bin_objs_list, bin_obj);
}
2015-09-14 00:08:31 +00:00
return true;
}
R_API RBinJavaCPTypeObj* r_bin_java_get_java_null_cp() {
if (R_BIN_JAVA_NULL_TYPE_INITTED)
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return &R_BIN_JAVA_NULL_TYPE;
memset (&R_BIN_JAVA_NULL_TYPE, 0, sizeof (R_BIN_JAVA_NULL_TYPE));
R_BIN_JAVA_NULL_TYPE.metas = R_NEW0 (RBinJavaMetaInfo);
if (!R_BIN_JAVA_NULL_TYPE.metas) return NULL;
memset (R_BIN_JAVA_NULL_TYPE.metas, 0, sizeof (RBinJavaMetaInfo));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_BIN_JAVA_NULL_TYPE.metas->type_info = &R_BIN_JAVA_CP_METAS[0];
R_BIN_JAVA_NULL_TYPE.metas->ord = 0;
R_BIN_JAVA_NULL_TYPE.file_offset = 0;
R_BIN_JAVA_NULL_TYPE_INITTED = true;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return &R_BIN_JAVA_NULL_TYPE;
}
R_API RBinJavaElementValueMetas* r_bin_java_get_ev_meta_from_tag(ut8 tag) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut16 i = 0;
RBinJavaElementValueMetas *res = &R_BIN_JAVA_ELEMENT_VALUE_METAS[13];
for (i = 0; i < R_BIN_JAVA_ELEMENT_VALUE_METAS_SZ; i++) {
if (tag == R_BIN_JAVA_ELEMENT_VALUE_METAS[i].tag) {
res = &R_BIN_JAVA_ELEMENT_VALUE_METAS[i];
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
break;
}
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API ut8 r_bin_java_quick_check(ut8 expected_tag, ut8 actual_tag, ut32 actual_len, const char* name) {
ut8 res = 0;
if (expected_tag > R_BIN_JAVA_CP_METAS_SZ) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
eprintf ("Invalid tag '%d' expected 0x%02x for %s.\n",actual_tag, expected_tag, name);
res = 1;
}else if (expected_tag != actual_tag) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
eprintf ("Invalid tag '%d' expected 0x%02x for %s.\n",actual_tag, expected_tag, name);
res = 1;
}else if (actual_len < R_BIN_JAVA_CP_METAS[expected_tag].len) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
eprintf ("Unable to parse '%d' expected sz=0x%02x got 0x%02x for %s.\n",
actual_tag, R_BIN_JAVA_CP_METAS[expected_tag].len, actual_len, name);
res = 2;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return res;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_raw_to_long(const ut8* raw, ut64 offset) {
return R_BIN_JAVA_LONG (raw, offset);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// yanked from careercup, because i am lazy:
// 1) dont want to figure out how make radare use math library
// 2) dont feel like figuring it out when google does it in O(1).
2014-01-22 02:38:36 +00:00
R_API double my_pow(ut64 base, int exp) {
ut8 flag=0;
ut64 res = 1;
if (exp < 0) {
2014-01-22 02:38:36 +00:00
flag = 1;
exp *= -1;
}
while (exp) {
2014-06-25 02:11:43 +00:00
if (exp & 1) res *= base;
exp >>= 1;
base *= base;
IFDBG eprintf ("Result: %"PFMT64d", base: %"PFMT64d", exp: %d\n", res, base, exp);
2014-01-22 02:38:36 +00:00
}
2014-06-25 02:11:43 +00:00
if (flag==0) return 1.0*res;
return (1.0/res);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API double r_bin_java_raw_to_double(const ut8* raw, ut64 offset) {
ut64 bits = R_BIN_JAVA_LONG(raw, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
int s = ((bits >> 63) == 0) ? 1 : -1;
int e = (int)((bits >> 52) & 0x7ffL);
long m = (e == 0) ?
(bits & 0xfffffffffffffLL) << 1 :
(bits & 0xfffffffffffffLL) | 0x10000000000000LL;
double res = 0.0;
2014-04-09 14:51:10 +00:00
IFDBG eprintf ("Convert Long to Double: %08"PFMT64x"\n", bits);
if (bits == 0x7ff0000000000000LL) return INFINITY;
if (bits == 0xfff0000000000000LL) return -INFINITY;
if (0x7ff0000000000001LL <= bits && bits <= 0x7fffffffffffffffLL) return NAN;
if (0xfff0000000000001LL <= bits && bits <= 0xffffffffffffffffLL) return NAN;
res = s* m* my_pow (2, e-1075);//XXXX TODO Get double to work correctly here
IFDBG eprintf (" High-bytes = %02x %02x %02x %02x\n", raw[0], raw[1], raw[2], raw[3]);
IFDBG eprintf (" Low-bytes = %02x %02x %02x %02x\n", raw[4], raw[5], raw[6], raw[7]);
IFDBG eprintf ("Convert Long to Double s: %d, m: 0x%08lx, e: 0x%08x, res: %f\n", s, m, e, res);
return res;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaField* r_bin_java_read_next_method(RBinJavaObj *bin, const ut64 offset, const ut8 * buf, const ut64 len) {
ut32 i, idx;
const ut8 * f_buf = buf + offset;
ut64 adv = 0;
RBinJavaCPTypeObj *item = NULL;
RBinJavaField *method;
if (bin == NULL)
return NULL;
if (offset+8>=len) {
return NULL;
}
method = (RBinJavaField *) R_NEW0(RBinJavaField);
if (method == NULL) {
2014-07-21 21:14:25 +00:00
eprintf ("Unable to allocate memory for method information\n");
return NULL;
}
method->metas = (RBinJavaMetaInfo *) R_NEW0(RBinJavaMetaInfo);
if (method->metas == NULL) {
eprintf ("Unable to allocate memory for meta information\n");
free(method);
return NULL;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
method->file_offset = offset;
method->flags = R_BIN_JAVA_USHORT (f_buf, 0);
method->flags_str = retrieve_method_access_string (method->flags);
// need to subtract 1 for the idx
method->name_idx = R_BIN_JAVA_USHORT (f_buf, 2);
method->descriptor_idx = R_BIN_JAVA_USHORT (f_buf, 4);
method->attr_count = R_BIN_JAVA_USHORT (f_buf, 6);
method->attributes = r_list_newf (r_bin_java_attribute_free);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
method->type = R_BIN_JAVA_FIELD_TYPE_METHOD;
method->metas->ord = bin->method_idx;
adv += 8;
idx = method->name_idx;
item = r_bin_java_get_item_from_bin_cp_list (bin, idx);
method->name = r_bin_java_get_utf8_from_bin_cp_list (bin, (ut32) (method->name_idx));
IFDBG eprintf ("Method name_idx: %d, which is: ord: %d, name: %s, value: %s\n", idx, item->metas->ord, ((RBinJavaCPTypeMetas *) item->metas->type_info)->name, method->name);
if(method->name == NULL) {
method->name = (char *)malloc (21);
snprintf ((char *) method->name, 20, "sym.method_%08x", method->metas->ord);
IFDBG eprintf ("r_bin_java_read_next_method: Unable to find the name for 0x%02x index.\n", method->name_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
idx = method->descriptor_idx;
item = r_bin_java_get_item_from_bin_cp_list (bin, idx);
method->descriptor = r_bin_java_get_utf8_from_bin_cp_list (bin, (ut32) method->descriptor_idx);
IFDBG eprintf ("Method descriptor_idx: %d, which is: ord: %d, name: %s, value: %s\n", idx, item->metas->ord, ((RBinJavaCPTypeMetas *) item->metas->type_info)->name, method->descriptor);
if(method->descriptor == NULL) {
method->descriptor = r_str_dup (NULL, "NULL");
IFDBG eprintf ("r_bin_java_read_next_method: Unable to find the descriptor for 0x%02x index.\n", method->descriptor_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
IFDBG eprintf ("Looking for a NameAndType CP with name_idx: %d descriptor_idx: %d\n", method->name_idx, method->descriptor_idx);
2014-03-30 17:29:29 +00:00
method->field_ref_cp_obj = r_bin_java_find_cp_ref_info_from_name_and_type (bin, method->name_idx, method->descriptor_idx);
if (method->field_ref_cp_obj) {
IFDBG eprintf ("Found the obj.\n");
2014-03-30 17:29:29 +00:00
item = r_bin_java_get_item_from_bin_cp_list (bin, method->field_ref_cp_obj->info.cp_method.class_idx);
IFDBG eprintf ("Method class reference value: %d, which is: ord: %d, name: %s\n", method->field_ref_cp_obj->info.cp_method.class_idx, item->metas->ord, ((RBinJavaCPTypeMetas *) item->metas->type_info)->name);
2014-03-30 17:29:29 +00:00
method->class_name = r_bin_java_get_item_name_from_bin_cp_list (bin, item);
IFDBG eprintf ("Method requesting ref_cp_obj the following which is: ord: %d, name: %s\n", method->field_ref_cp_obj->metas->ord, ((RBinJavaCPTypeMetas *) method->field_ref_cp_obj->metas->type_info)->name);
IFDBG eprintf ("MethodRef class name resolves to: %s\n", method->class_name);
if (method->class_name == NULL)
method->class_name = r_str_dup (NULL, "NULL");
} else {
// XXX - default to this class?
method->field_ref_cp_obj = r_bin_java_get_item_from_bin_cp_list(bin, bin->cf2.this_class);
method->class_name = r_bin_java_get_item_name_from_bin_cp_list (bin, method->field_ref_cp_obj);
}
IFDBG eprintf ("Parsing %s(%s)\n", method->name, method->descriptor);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (method->attr_count > 0) {
method->attr_offset = adv+offset;
RBinJavaAttrInfo* attr = NULL;
for (i=0; i<method->attr_count; i++) {
attr = r_bin_java_read_next_attr (bin, adv+offset, buf, len);
2014-04-05 04:16:17 +00:00
if (!attr) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Method Attribute: %d.\n", i);
break;
}
if ((r_bin_java_get_attr_type_by_name (attr->name))->type == R_BIN_JAVA_ATTR_TYPE_CODE_ATTR) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// This is necessary for determing the appropriate number of bytes when readin
// uoffset, ustack, ulocalvar values
bin->cur_method_code_length = attr->info.code_attr.code_length;
bin->offset_sz = 2;//(attr->info.code_attr.code_length > 65535) ? 4 : 2;
bin->ustack_sz = 2;// (attr->info.code_attr.max_stack > 65535) ? 4 : 2;
bin->ulocalvar_sz = 2;//(attr->info.code_attr.max_locals > 65535) ? 4 : 2;
}
IFDBG eprintf ("Parsing @ 0x%"PFMT64x" (%s) = 0x%"PFMT64x" bytes\n", attr->file_offset, attr->name, attr->size);
r_list_append (method->attributes, attr);
adv += attr->size;
2014-04-05 04:16:17 +00:00
if (adv + offset >= len) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Method Attribute: %d.\n", i);
break;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
method->size = adv;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// reset after parsing the method attributes
IFDBG eprintf ("Parsing @ 0x%"PFMT64x" %s(%s) = 0x%"PFMT64x" bytes\n", method->file_offset, method->name, method->descriptor, method->size);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return method;
}
R_API RBinJavaField* r_bin_java_read_next_field(RBinJavaObj *bin, const ut64 offset, const ut8 * buffer, const ut64 len) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaAttrInfo* attr;
ut32 i, idx;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 buf[8];
RBinJavaCPTypeObj *item = NULL;
2014-03-28 17:04:57 +00:00
const ut8 *f_buf = buffer + offset;
ut64 adv = 0;
RBinJavaField *field;
if (bin == NULL)
return NULL;
if (offset+8>=len) {
return NULL;
}
field = (RBinJavaField *) R_NEW0(RBinJavaField);
if (field == NULL) {
2014-07-21 21:14:25 +00:00
eprintf ("Unable to allocate memory for field information\n");
return NULL;
}
field->metas = (RBinJavaMetaInfo *) R_NEW0(RBinJavaMetaInfo);
2014-07-21 21:14:25 +00:00
if (field->metas == NULL) {
eprintf ("Unable to allocate memory for meta information\n");
free(field);
return NULL;
}
memcpy (buf, f_buf, 8);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
field->file_offset = offset;
field->flags = R_BIN_JAVA_USHORT (buf, 0);
field->flags_str = retrieve_field_access_string (field->flags);
field->name_idx = R_BIN_JAVA_USHORT (buf, 2);
field->descriptor_idx = R_BIN_JAVA_USHORT (buf, 4);
field->attr_count = R_BIN_JAVA_USHORT (buf, 6);
field->attributes = r_list_newf (r_bin_java_attribute_free);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
field->type = R_BIN_JAVA_FIELD_TYPE_FIELD;
adv += 8;
field->metas->ord = bin->field_idx;
idx = field->name_idx;
item = r_bin_java_get_item_from_bin_cp_list (bin, idx);
field->name = r_bin_java_get_utf8_from_bin_cp_list (bin, (ut32) (field->name_idx));
IFDBG eprintf ("Field name_idx: %d, which is: ord: %d, name: %s, value: %s\n", idx, item->metas->ord, ((RBinJavaCPTypeMetas *) item->metas->type_info)->name, field->name);
if(field->name == NULL) {
field->name = (char *)malloc (21);
snprintf ((char *) field->name, 20, "sym.field_%08x", field->metas->ord);
IFDBG eprintf ("r_bin_java_read_next_field: Unable to find the name for 0x%02x index.\n", field->name_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
idx = field->descriptor_idx;
item = r_bin_java_get_item_from_bin_cp_list (bin, idx);
field->descriptor = r_bin_java_get_utf8_from_bin_cp_list (bin, (ut32) field->descriptor_idx);
IFDBG eprintf ("Field descriptor_idx: %d, which is: ord: %d, name: %s, value: %s\n", idx, item->metas->ord, ((RBinJavaCPTypeMetas *) item->metas->type_info)->name, field->descriptor);
if(field->descriptor == NULL) {
field->descriptor = r_str_dup (NULL, "NULL");
IFDBG eprintf ("r_bin_java_read_next_field: Unable to find the descriptor for 0x%02x index.\n", field->descriptor_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
IFDBG eprintf ("Looking for a NameAndType CP with name_idx: %d descriptor_idx: %d\n", field->name_idx, field->descriptor_idx);
2014-03-30 17:29:29 +00:00
field->field_ref_cp_obj = r_bin_java_find_cp_ref_info_from_name_and_type (bin, field->name_idx, field->descriptor_idx);
if (field->field_ref_cp_obj) {
IFDBG eprintf ("Found the obj.\n");
2014-03-30 17:29:29 +00:00
item = r_bin_java_get_item_from_bin_cp_list (bin, field->field_ref_cp_obj->info.cp_field.class_idx);
IFDBG eprintf ("Field class reference value: %d, which is: ord: %d, name: %s\n", field->field_ref_cp_obj->info.cp_field.class_idx, item->metas->ord, ((RBinJavaCPTypeMetas *) item->metas->type_info)->name);
2014-03-30 17:29:29 +00:00
field->class_name = r_bin_java_get_item_name_from_bin_cp_list (bin, item);
IFDBG eprintf ("Field requesting ref_cp_obj the following which is: ord: %d, name: %s\n", field->field_ref_cp_obj->metas->ord, ((RBinJavaCPTypeMetas *) field->field_ref_cp_obj->metas->type_info)->name);
IFDBG eprintf ("FieldRef class name resolves to: %s\n", field->class_name);
if (field->class_name == NULL)
field->class_name = r_str_dup (NULL, "NULL");
}else {
// XXX - default to this class?
field->field_ref_cp_obj = r_bin_java_get_item_from_bin_cp_list(bin, bin->cf2.this_class);
field->class_name = r_bin_java_get_item_name_from_bin_cp_list (bin, field->field_ref_cp_obj);
}
IFDBG eprintf ("Parsing %s(%s)", field->name, field->descriptor);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (field->attr_count > 0) {
field->attr_offset = adv+offset;
for (i=0; i< field->attr_count && offset+adv<len; i++) {
2014-03-31 15:34:17 +00:00
attr = r_bin_java_read_next_attr(bin, offset+adv, buffer, len);
2014-04-05 04:16:17 +00:00
if (!attr) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Field Attribute: %d.\n", i);
break;
}
if ((r_bin_java_get_attr_type_by_name(attr->name))->type == R_BIN_JAVA_ATTR_TYPE_CODE_ATTR) {
// This is necessary for determing the appropriate number of bytes when readin
// uoffset, ustack, ulocalvar values
bin->cur_method_code_length = attr->info.code_attr.code_length;
bin->offset_sz = 2;//(attr->info.code_attr.code_length > 65535) ? 4 : 2;
bin->ustack_sz = 2;// (attr->info.code_attr.max_stack > 65535) ? 4 : 2;
bin->ulocalvar_sz = 2;//(attr->info.code_attr.max_locals > 65535) ? 4 : 2;
}
r_list_append (field->attributes, attr);
adv += attr->size;
2014-04-05 04:16:17 +00:00
if (adv + offset >= len) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Field Attribute: %d.\n", i);
break;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
field->size = adv;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return field;
}
R_API RBinJavaCPTypeObj* r_bin_java_clone_cp_idx(RBinJavaObj *bin, ut32 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaCPTypeObj* obj = NULL;
if (bin)
obj = r_bin_java_get_item_from_bin_cp_list (bin, idx);
return r_bin_java_clone_cp_item (obj);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaCPTypeObj* r_bin_java_clone_cp_item(RBinJavaCPTypeObj *obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaCPTypeObj *clone_obj = NULL;
if (obj == NULL)
return clone_obj;
clone_obj = R_NEW0 (RBinJavaCPTypeObj);
if(clone_obj) {
memcpy (clone_obj, obj, sizeof (RBinJavaCPTypeObj));
clone_obj->metas = (RBinJavaMetaInfo *) R_NEW0(RBinJavaMetaInfo);
clone_obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[clone_obj->tag];
clone_obj->name = strdup (obj->name);
if(obj->tag == R_BIN_JAVA_CP_UTF8) {
clone_obj->info.cp_utf8.bytes = (ut8 *) malloc (obj->info.cp_utf8.length+1);
if (clone_obj->info.cp_utf8.bytes) {
memcpy (clone_obj->info.cp_utf8.bytes, obj->info.cp_utf8.bytes, clone_obj->info.cp_utf8.length);
} else {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// TODO: eprintf allocation error
}
}
}
return clone_obj;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaCPTypeObj* r_bin_java_read_next_constant_pool_item(RBinJavaObj *bin, const ut64 offset, const ut8* buf, ut64 len) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaCPTypeMetas *java_constant_info = NULL;
ut8 tag = 0;
ut64 buf_sz = 0;
ut8 *cp_buf = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 str_len = 0;
RBinJavaCPTypeObj *java_obj = NULL;
tag = buf[offset];
if (tag > R_BIN_JAVA_CP_METAS_SZ) {
eprintf ("Invalid tag '%d' at offset 0x%08"PFMT64x"\n", tag, (ut64)offset);
2015-11-24 17:26:10 +00:00
return NULL;
#if 0
java_obj = r_bin_java_unknown_cp_new (bin, &tag, 1);
if (java_obj != NULL && java_obj->metas != NULL) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
java_obj->file_offset = offset;
java_obj->loadaddr = bin->loadaddr;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return NULL; // early error to avoid future overflows
//return java_obj;
2015-11-24 17:26:10 +00:00
#endif
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
java_constant_info = &R_BIN_JAVA_CP_METAS[tag];
if (java_constant_info->tag == 0 || java_constant_info->tag == 2) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return java_obj;
}
buf_sz += java_constant_info->len;
if (java_constant_info->tag == 1) {
str_len = R_BIN_JAVA_USHORT (buf, offset+1);
buf_sz += str_len;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
cp_buf = calloc (buf_sz, 1);
if (!cp_buf)
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return java_obj;
if (offset + buf_sz < len) {
memcpy (cp_buf, (ut8*) buf + offset, buf_sz);
2015-11-05 11:49:27 +00:00
IFDBG eprintf ("Parsed the tag '%d':%s and create object from offset 0x%08"PFMT64x".\n",tag, R_BIN_JAVA_CP_METAS[tag].name, offset);
java_obj = (*java_constant_info->allocs->new_obj)(bin, cp_buf, buf_sz);
if (java_obj != NULL && java_obj->metas != NULL) {
java_obj->file_offset = offset;
//IFDBG eprintf ("java_obj->file_offset = 0x%08"PFMT64x".\n",java_obj->file_offset);
} else if (!java_obj) {
eprintf ("Unable to parse the tag '%d' and create valid object.\n",tag);
} else if (!java_obj->metas) {
eprintf ("Unable to parse the tag '%d' and create valid object.\n",tag);
} else {
eprintf ("Failed to set the java_obj->metas-file_offset for '%d' offset is(0x%08"PFMT64x").\n",tag, offset);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
free (cp_buf);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return java_obj;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaInterfaceInfo* r_bin_java_read_next_interface_item(RBinJavaObj *bin, const ut64 offset, const ut8 * buf, const ut64 len) {
ut8 idx[2] = {0};
RBinJavaInterfaceInfo *ifobj;
const ut8 * if_buf = buf + offset;
if (offset+2>=len)
return NULL;
memcpy (&idx, if_buf, 2);
ifobj = r_bin_java_interface_new (bin, if_buf, len-offset);
if (ifobj) {
ifobj->file_offset = offset;
}
return ifobj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
//R_API void addrow (RBinJavaObj *bin, int addr, int line) {
// int n = bin->lines.count++;
// // XXX. possible memleak
// bin->lines.addr = realloc (bin->lines.addr, sizeof (int)*n+1);
// bin->lines.addr[n] = addr;
// bin->lines.line = realloc (bin->lines.line, sizeof (int)*n+1);
// bin->lines.line[n] = line;
//}
2014-06-25 02:11:43 +00:00
//R_API struct r_bin_java_cp_item_t* r_bin_java_get_item_from_cp_CP(RBinJavaObj *bin, int i) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// return (i<0||i>bin->cf.cp_count)? &cp_null_item: &bin->cp_items[i];
//}
R_API char* r_bin_java_get_utf8_from_bin_cp_list (RBinJavaObj *bin, ut64 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Search through the Constant Pool list for the given CP Index.
If the idx not found by directly going to the list index,
the list will be walked and then the IDX will be checked.
rvalue: new char* for caller to free.
*/
if (bin == NULL)
return NULL;
return r_bin_java_get_utf8_from_cp_item_list (bin->cp_list, idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API ut32 r_bin_java_get_utf8_len_from_bin_cp_list (RBinJavaObj *bin, ut64 idx) {
/*
Search through the Constant Pool list for the given CP Index.
If the idx not found by directly going to the list index,
the list will be walked and then the IDX will be checked.
rvalue: new char* for caller to free.
*/
if (bin == NULL)
return 0;
return r_bin_java_get_utf8_len_from_cp_item_list (bin->cp_list, idx);
}
R_API char* r_bin_java_get_name_from_bin_cp_list(RBinJavaObj *bin, ut64 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Search through the Constant Pool list for the given CP Index.
If the idx not found by directly going to the list index,
the list will be walked and then the IDX will be checked.
rvalue: new char* for caller to free.
*/
if (bin == NULL)
return NULL;
return r_bin_java_get_name_from_cp_item_list (bin->cp_list, idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char* r_bin_java_get_desc_from_bin_cp_list(RBinJavaObj *bin, ut64 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Search through the Constant Pool list for the given CP Index.
If the idx not found by directly going to the list index,
the list will be walked and then the IDX will be checked.
rvalue: new char* for caller to free.
*/
if (bin == NULL)
return NULL;
return r_bin_java_get_desc_from_cp_item_list (bin->cp_list, idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaCPTypeObj* r_bin_java_get_item_from_bin_cp_list(RBinJavaObj *bin, ut64 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Search through the Constant Pool list for the given CP Index.
If the idx not found by directly going to the list index,
the list will be walked and then the IDX will be checked.
2013-09-14 12:04:08 +00:00
rvalue: RBinJavaObj* (user does NOT free).
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
if (bin == NULL)
return NULL;
if (idx > bin->cp_count || idx == 0)
return r_bin_java_get_java_null_cp();
return r_bin_java_get_item_from_cp_item_list (bin->cp_list, idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char* r_bin_java_get_item_name_from_bin_cp_list(RBinJavaObj *bin, RBinJavaCPTypeObj *obj) {
char *res = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Given a constant poool object Class, FieldRef, MethodRef, or InterfaceMethodRef
return the actual descriptor string.
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
@param cp_list: RList of RBinJavaCPTypeObj *
@param obj object to look up the name for
2013-09-14 12:04:08 +00:00
@rvalue char* (user frees) or NULL
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
if (bin && obj) {
res = r_bin_java_get_item_name_from_cp_item_list (
bin->cp_list, obj, MAX_CPITEMS);
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char* r_bin_java_get_item_desc_from_bin_cp_list (RBinJavaObj *bin, RBinJavaCPTypeObj *obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Given a constant poool object Class, FieldRef, MethodRef, or InterfaceMethodRef
return the actual descriptor string.
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
@param cp_list: RList of RBinJavaCPTypeObj *
@param obj object to look up the name for
2013-09-14 12:04:08 +00:00
@rvalue char* (user frees) or NULL
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
if (bin == NULL)
return NULL;
return r_bin_java_get_item_desc_from_cp_item_list (bin->cp_list, obj, MAX_CPITEMS);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char* r_bin_java_get_utf8_from_cp_item_list(RList *cp_list, ut64 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Search through the Constant Pool list for the given CP Index.
If the idx not found by directly going to the list index,
the list will be walked and then the IDX will be checked.
rvalue: new char* for caller to free.
*/
char *value = NULL;
RListIter *iter;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaCPTypeObj *item = NULL;
if (cp_list == NULL)
return NULL;
item = (RBinJavaCPTypeObj *) r_list_get_n (cp_list, idx);
if (item && (item->tag == R_BIN_JAVA_CP_UTF8) && item->metas->ord == idx) {
value = convert_string ((const char *)item->info.cp_utf8.bytes, item->info.cp_utf8.length);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
if (value == NULL) {
r_list_foreach (cp_list, iter, item) {
if (item && (item->tag == R_BIN_JAVA_CP_UTF8) && item->metas->ord == idx) {
value = convert_string ((const char *)item->info.cp_utf8.bytes, item->info.cp_utf8.length);
break;
}
}
}
return value;
}
R_API ut32 r_bin_java_get_utf8_len_from_cp_item_list(RList *cp_list, ut64 idx) {
/*
Search through the Constant Pool list for the given CP Index.
If the idx not found by directly going to the list index,
the list will be walked and then the IDX will be checked.
rvalue: new ut32 .
*/
ut32 value = -1;
RListIter *iter;
RBinJavaCPTypeObj *item = NULL;
if (cp_list == NULL) return 0;
item = (RBinJavaCPTypeObj *) r_list_get_n (cp_list, idx);
if (item && (item->tag == R_BIN_JAVA_CP_UTF8) && item->metas->ord == idx) {
value = item->info.cp_utf8.length;
}
if (value == -1) {
r_list_foreach (cp_list, iter, item) {
if (item && (item->tag == R_BIN_JAVA_CP_UTF8) && item->metas->ord == idx) {
value = item->info.cp_utf8.length;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
break;
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
}
R_API RBinJavaCPTypeObj* r_bin_java_get_item_from_cp_item_list (RList *cp_list, ut64 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Search through the Constant Pool list for the given CP Index.
rvalue: RBinJavaObj *
*/
RBinJavaCPTypeObj *item = NULL;
if (cp_list == NULL)
return NULL;
item = (RBinJavaCPTypeObj *) r_list_get_n (cp_list, idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return item;
}
R_API char* r_bin_java_get_item_name_from_cp_item_list (RList *cp_list, RBinJavaCPTypeObj *obj, int depth) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Given a constant poool object Class, FieldRef, MethodRef, or InterfaceMethodRef
return the actual descriptor string.
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
@param cp_list: RList of RBinJavaCPTypeObj *
@param obj object to look up the name for
2013-09-14 12:04:08 +00:00
@rvalue ut8* (user frees) or NULL
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
if (obj == NULL || cp_list == NULL || depth <0) {
return NULL;
}
switch (obj->tag) {
case R_BIN_JAVA_CP_NAMEANDTYPE:
return r_bin_java_get_utf8_from_cp_item_list (
cp_list, obj->info.cp_name_and_type.name_idx);
case R_BIN_JAVA_CP_CLASS:
return r_bin_java_get_utf8_from_cp_item_list (
cp_list, obj->info.cp_class.name_idx);
// XXX - Probably not good form, but they are the same memory structure
case R_BIN_JAVA_CP_FIELDREF:
case R_BIN_JAVA_CP_INTERFACEMETHOD_REF:
case R_BIN_JAVA_CP_METHODREF:
obj = r_bin_java_get_item_from_cp_item_list (
cp_list, obj->info.cp_method.name_and_type_idx);
return r_bin_java_get_item_name_from_cp_item_list (
cp_list, obj, depth-1);
default:
return NULL;
case 0:
2015-05-12 18:41:05 +00:00
IFDBG eprintf ("Invalid 0 tag in the constant pool\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char* r_bin_java_get_name_from_cp_item_list (RList *cp_list, ut64 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Given a constant poool object Class, FieldRef, MethodRef, or InterfaceMethodRef
return the actual descriptor string.
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
@param cp_list: RList of RBinJavaCPTypeObj *
@param obj object to look up the name for
2013-09-14 12:04:08 +00:00
@rvalue ut8* (user frees) or NULL
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
RBinJavaCPTypeObj *obj = r_bin_java_get_item_from_cp_item_list (
cp_list, idx);
if (obj && cp_list) {
return r_bin_java_get_item_name_from_cp_item_list (
cp_list, obj, MAX_CPITEMS);
}
return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char* r_bin_java_get_item_desc_from_cp_item_list (RList *cp_list, RBinJavaCPTypeObj *obj, int depth) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Given a constant poool object FieldRef, MethodRef, or InterfaceMethodRef
return the actual descriptor string.
2013-09-14 12:04:08 +00:00
@rvalue ut8* (user frees) or NULL
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
if (!obj || !cp_list || depth<0)
return NULL;
switch (obj->tag) {
case R_BIN_JAVA_CP_NAMEANDTYPE:
return r_bin_java_get_utf8_from_cp_item_list (cp_list,
obj->info.cp_name_and_type.descriptor_idx);
// XXX - Probably not good form, but they are the same memory structure
case R_BIN_JAVA_CP_FIELDREF:
case R_BIN_JAVA_CP_INTERFACEMETHOD_REF:
case R_BIN_JAVA_CP_METHODREF:
obj = r_bin_java_get_item_from_cp_item_list (cp_list,
obj->info.cp_method.name_and_type_idx);
return r_bin_java_get_item_desc_from_cp_item_list (
cp_list, obj, depth-1);
default:
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char* r_bin_java_get_desc_from_cp_item_list (RList *cp_list, ut64 idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Given a constant poool object FieldRef, MethodRef, or InterfaceMethodRef
return the actual descriptor string.
2013-09-14 12:04:08 +00:00
@rvalue ut8* (user frees) or NULL
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
RBinJavaCPTypeObj *obj = r_bin_java_get_item_from_cp_item_list (cp_list, idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (cp_list == NULL)
return NULL;
return r_bin_java_get_item_desc_from_cp_item_list (cp_list, obj, MAX_CPITEMS);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaAttrInfo* r_bin_java_get_method_code_attribute(const RBinJavaField *method) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Search through a methods attributes and return the code attr.
2013-09-14 12:04:08 +00:00
rvalue: RBinJavaAttrInfo* if found otherwise NULL.
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
RBinJavaAttrInfo *res = NULL, *attr = NULL;
RListIter *iter;
if (method) {
r_list_foreach (method->attributes, iter, attr) {
if (attr && (attr->type == R_BIN_JAVA_ATTR_TYPE_CODE_ATTR)) {
res = attr;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
break;
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaAttrInfo* r_bin_java_get_attr_from_field(RBinJavaField *field, R_BIN_JAVA_ATTR_TYPE attr_type, ut32 pos) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
/*
Search through the Attribute list for the given type starting at position pos.
rvalue: NULL or the first occurrence of attr_type after pos
*/
RBinJavaAttrInfo *attr = NULL, *item;
RListIter *iter;
ut32 i = 0;
if (field) {
r_list_foreach (field->attributes, iter, item) {
// Note the increment happens after the comparison
if ((i++) >= pos) {
if (item && (item->type == attr_type)) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr = item;
break;
}
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return attr;
}
R_API ut8* r_bin_java_get_attr_buf(RBinJavaObj *bin, ut64 sz, const ut64 offset, const ut8 *buf, const ut64 len) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 *attr_buf = NULL;
int pending = len-offset;
const ut8 * a_buf = offset + buf;
attr_buf = (ut8 *) calloc (pending, 1);
if (attr_buf == NULL) {
eprintf ("Unable to allocate enough bytes (0x%04"PFMT64x
") to read in the attribute.\n", sz);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return attr_buf;
}
memcpy (attr_buf, a_buf, pending); //sz+1);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return attr_buf;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_default_attr_new(ut8* buffer, ut64 sz, ut64 buf_offset) {
2014-03-28 18:40:51 +00:00
// NOTE: this function receives the buffer offset in the original buffer,
// but the buffer is already point to that particular offset.
// XXX - all the code that relies on this function should probably be modified
// so that the original buffer pointer is passed in and then the buffer+buf_offset
// points to the correct location.
RBinJavaAttrInfo *attr = R_NEW0 (RBinJavaAttrInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaAttrMetas *type_info = NULL;
attr->metas = R_NEW0 (RBinJavaMetaInfo);
if (attr->metas == NULL) {
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
attr->file_offset = buf_offset;
attr->name_idx = R_BIN_JAVA_USHORT (buffer, 0);
attr->length = R_BIN_JAVA_UINT (buffer, 2);
2014-03-28 18:40:51 +00:00
attr->size = R_BIN_JAVA_UINT (buffer, 2) + 6;
attr->name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, attr->name_idx);
if(attr->name == NULL) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// Something bad has happened
attr->name = r_str_dup (NULL, "NULL");
eprintf ("r_bin_java_default_attr_new: Unable to find the name for %d index.\n", attr->name_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
type_info = r_bin_java_get_attr_type_by_name (attr->name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->metas->ord = (R_BIN_JAVA_GLOBAL_BIN->attr_idx++);
attr->metas->type_info = (void *) type_info;
//IFDBG eprintf (" Addrs for type_info [tag=%d]: 0x%08"PFMT64x"\n", type_val, &attr->metas->type_info);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return attr;
}
2014-03-18 00:36:54 +00:00
R_API RBinJavaAttrMetas* r_bin_java_get_attr_type_by_name(const char *name) {
// TODO: use sdb/hashtable here
int i;
for (i = 0; i < RBIN_JAVA_ATTRS_METAS_SZ; i++) {
if (!strcmp ((const char *) name, RBIN_JAVA_ATTRS_METAS[i].name)) {
return &RBIN_JAVA_ATTRS_METAS[i];
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2015-11-20 15:53:58 +00:00
return &RBIN_JAVA_ATTRS_METAS[R_BIN_JAVA_ATTR_TYPE_UNKNOWN_ATTR];
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaAttrInfo* r_bin_java_read_next_attr(RBinJavaObj *bin, const ut64 offset, const ut8* buf, const ut64 buf_len) {
2013-09-14 12:04:08 +00:00
RBinJavaAttrInfo* attr = NULL;
ut32 sz = 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8* buffer = NULL;
const ut8* a_buf = offset + buf;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 attr_idx_len = 6;
if (offset +6 > buf_len) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile in Attribute offset "
"(0x%"PFMT64x") > len of remaining bytes (0x%"PFMT64x").\n", offset, buf_len);
2014-04-05 04:16:17 +00:00
return attr;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// ut16 attr_idx, ut32 length of attr.
sz = R_BIN_JAVA_UINT (a_buf, 2) + attr_idx_len; //r_bin_java_read_int (bin, buf_offset+2) + attr_idx_len;
if (sz + offset > buf_len) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile in Attribute len "
"(0x%x) + offset (0x%"PFMT64x") exceeds length of buffer (0x%"PFMT64x").\n",
sz, offset, buf_len);
return attr;
}
// when reading the attr bytes, need to also
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// include the initial 6 bytes, which
// are not included in the attribute length
//,
// sz, buf_offset, buf_offset+sz);
buffer = r_bin_java_get_attr_buf (bin, sz, offset, buf, buf_len);
//printf ("%d %d %d\n", sz, buf_len, offset);
if (offset < buf_len) {
attr = r_bin_java_read_next_attr_from_buffer (buffer, buf_len - offset, offset);
free (buffer);
if (!attr) {
return NULL;
}
attr->size = sz;
} else {
eprintf ("IS OOB\n");
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return attr;
}
R_API RBinJavaAttrInfo* r_bin_java_read_next_attr_from_buffer (ut8 *buffer, st64 sz, st64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaAttrInfo *attr = NULL;
char* name = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
ut16 name_idx;
st64 nsz;
2013-09-14 12:04:08 +00:00
RBinJavaAttrMetas* type_info = NULL;
if (!buffer || ((int)sz)<4 || buf_offset<0) {
eprintf ("r_bin_Java_read_next_attr_from_buffer: invalid buffer size %d\n", (int)sz);
return NULL;
}
name_idx = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
nsz = R_BIN_JAVA_UINT (buffer, offset);
offset += 4;
name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, name_idx);
if (!name) name = strdup ("unknown");
IFDBG eprintf("r_bin_java_read_next_attr: name_idx = %d is %s\n", name_idx, name);
type_info = r_bin_java_get_attr_type_by_name (name);
if (type_info) {
IFDBG eprintf ("Typeinfo: %s, was %s\n", type_info->name, name);
//printf ("SZ %d %d %d\n", nsz, sz, buf_offset);
if (nsz > sz) {
free (name);
2016-04-10 20:59:10 +00:00
return NULL;
}
if ((attr = type_info->allocs->new_obj (buffer, nsz, buf_offset))) {
attr->metas->ord = (R_BIN_JAVA_GLOBAL_BIN->attr_idx++);
}
} else {
eprintf ("r_bin_java_read_next_attr_from_buffer: Cannot find type_info for %s\n", name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
free (name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_read_class_file2(RBinJavaObj *bin, const ut64 offset, const ut8 *obuf, ut64 len) {
const ut8* cf2_buf = obuf + offset;
RBinJavaCPTypeObj *this_class_cp_obj = NULL;
IFDBG eprintf ("\n0x%"PFMT64x" Offset before reading the cf2 structure\n", offset);
/*
Reading the following fields:
ut16 access_flags;
ut16 this_class;
ut16 super_class;
*/
bin->cf2.cf2_size = 6;
bin->cf2.access_flags = R_BIN_JAVA_USHORT (cf2_buf, 0);
bin->cf2.this_class = R_BIN_JAVA_USHORT (cf2_buf, 2);
bin->cf2.super_class = R_BIN_JAVA_USHORT (cf2_buf, 4);
free (bin->cf2.flags_str);
free (bin->cf2.this_class_name);
bin->cf2.flags_str = retrieve_class_method_access_string(bin->cf2.access_flags);
this_class_cp_obj = r_bin_java_get_item_from_bin_cp_list(bin, bin->cf2.this_class);
bin->cf2.this_class_name = r_bin_java_get_item_name_from_bin_cp_list (bin, this_class_cp_obj);
IFDBG eprintf("This class flags are: %s\n", bin->cf2.flags_str);
return bin->cf2.cf2_size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API ut64 r_bin_java_parse_cp_pool (RBinJavaObj *bin, const ut64 offset, const ut8 * buf, const ut64 len) {
int ord = 0;
ut64 adv = 0;
RBinJavaCPTypeObj *obj = NULL;
const ut8* cp_buf = buf + offset;
r_list_free (bin->cp_list);
bin->cp_list = r_list_newf (r_bin_java_constant_pool);
bin->cp_offset = offset;
memcpy ((char *) &bin->cp_count, cp_buf, 2);
bin->cp_count = R_BIN_JAVA_USHORT (cp_buf, 0)-1;
adv += 2;
IFDBG eprintf ("ConstantPoolCount %d\n", bin->cp_count);
r_list_append (bin->cp_list, r_bin_java_get_java_null_cp ());
for (ord=1,bin->cp_idx=0; bin->cp_idx < bin->cp_count && adv < len; ord++, bin->cp_idx++) {
obj = r_bin_java_read_next_constant_pool_item (bin, offset+adv, buf, len);
if (obj) {
//IFDBG eprintf ("SUCCESS Read ConstantPoolItem %d\n", i);
obj->metas->ord = ord;
obj->idx = ord;
r_list_append (bin->cp_list, obj);
if (obj->tag == R_BIN_JAVA_CP_LONG || obj->tag == R_BIN_JAVA_CP_DOUBLE) {
//i++;
ord++;
bin->cp_idx++;
r_list_append (bin->cp_list, &R_BIN_JAVA_NULL_TYPE);
}
IFDBG ((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
adv += ((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->calc_size (obj);
2014-04-05 04:16:17 +00:00
if (offset + adv > len) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Constant Pool Object: %d.\n", ord);
break;
}
} else {
IFDBG eprintf ("Failed to read ConstantPoolItem %d\n", bin->cp_idx);
break;
}
}
// Update the imports
r_bin_java_set_imports (bin);
bin->cp_size = adv;
return bin->cp_size;
}
R_API ut64 r_bin_java_parse_interfaces (RBinJavaObj *bin, const ut64 offset, const ut8 * buf, const ut64 len) {
int i = 0;
ut64 adv = 0;
RBinJavaInterfaceInfo *interfaces_obj;
const ut8* if_buf = buf + offset;
2014-03-28 17:04:57 +00:00
bin->cp_offset = offset;
bin->interfaces_offset = offset;
r_list_free (bin->interfaces_list);
bin->interfaces_list = r_list_newf (r_bin_java_interface_free);
bin->interfaces_count = R_BIN_JAVA_USHORT (if_buf, 0);
adv += 2;
IFDBG eprintf ("Interfaces count: %d\n", bin->interfaces_count);
if (bin->interfaces_count > 0) {
for (i = 0; i < bin->interfaces_count; i++) {
interfaces_obj = r_bin_java_read_next_interface_item (bin, offset+adv, buf, len);
if (interfaces_obj) {
r_list_append (bin->interfaces_list, interfaces_obj);
adv += interfaces_obj->size;
2014-04-05 04:16:17 +00:00
if (offset + adv > len) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Interface: %d.\n", i);
break;
}
} else
break;
}
}
bin->interfaces_size = adv;
return adv;
}
R_API ut64 r_bin_java_parse_fields (RBinJavaObj *bin, const ut64 offset, const ut8 * buf, const ut64 len) {
int i = 0;
ut64 adv = 0;
RBinJavaField *field;
const ut8 * fm_buf = buf + offset;
r_list_free (bin->fields_list);
bin->fields_list = r_list_newf (r_bin_java_fmtype_free);
bin->fields_offset = offset;
if (offset+2>=len)
return UT64_MAX;
bin->fields_count = R_BIN_JAVA_USHORT (fm_buf, 0);
adv += 2;
IFDBG eprintf ("Fields count: %d 0x%"PFMT64x"\n", bin->fields_count, bin->fields_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (bin->fields_count > 0) {
for (i = 0; i < bin->fields_count; i++, bin->field_idx++) {
field = r_bin_java_read_next_field (bin, offset+adv, buf, len);
if (field) {
adv += field->size;
r_list_append (bin->fields_list, field);
IFDBG r_bin_java_print_field_summary(field);
2014-04-05 04:16:17 +00:00
if (adv + offset > len) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Field: %d.\n", i);
break;
}
} else {
IFDBG eprintf ("Failed to read Field %d\n", i);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
}
bin->fields_size = adv;
return adv;
}
R_API ut64 r_bin_java_parse_attrs (RBinJavaObj *bin, const ut64 offset, const ut8 * buf, const ut64 len) {
int i = 0;
ut64 adv = 0;
const ut8 * a_buf = buf + offset;
if (offset+2>=len) {
// Check if we can read that USHORT
return UT64_MAX;
}
r_list_free (bin->attrs_list);
bin->attrs_list = r_list_newf (r_bin_java_attribute_free);
bin->attrs_offset = offset;
bin->attrs_count = R_BIN_JAVA_USHORT (a_buf, adv);
adv += 2;
if (bin->attrs_count > 0) {
for (i=0; i<bin->attrs_count; i++, bin->attr_idx++) {
RBinJavaAttrInfo* attr = r_bin_java_read_next_attr (bin, offset+adv, buf, len);
2014-04-05 04:16:17 +00:00
if (!attr) {
//eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Attribute: %d.\n", i);
break;
}
r_list_append (bin->attrs_list, attr);
adv += attr->size;
if (adv + offset >= len) {
//eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Attribute: %d.\n", i);
break;
}
}
}
bin->attrs_size = adv;
return adv;
}
R_API ut64 r_bin_java_parse_methods (RBinJavaObj *bin, const ut64 offset, const ut8 * buf, const ut64 len) {
int i = 0;
ut64 adv = 0;
RBinJavaField *method;
const ut8 * fm_buf = buf + offset;
r_list_free (bin->methods_list);
bin->methods_list = r_list_newf (r_bin_java_fmtype_free);
if (offset + 2 >= len) {
return 0LL;
}
bin->methods_offset = offset;
bin->methods_count = R_BIN_JAVA_USHORT (fm_buf, 0);
adv += 2;
IFDBG eprintf ("Methods count: %d 0x%"PFMT64x"\n", bin->methods_count, bin->methods_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
bin->main = NULL;
bin->entrypoint = NULL;
bin->main_code_attr = NULL;
bin->entrypoint_code_attr = NULL;
if (bin->methods_count > 0) {
for (i=0; i<bin->methods_count; i++, bin->method_idx++) {
method = r_bin_java_read_next_method (bin, offset+adv, buf, len);
if (method) {
adv += method->size;
2013-09-14 12:04:08 +00:00
r_list_append (bin->methods_list, method);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
// Update Main, Init, or Class Init
if (method && !strcmp ((const char *) method->name, "main")) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
bin->main = method;
// get main code attr
bin->main_code_attr = r_bin_java_get_attr_from_field (method, R_BIN_JAVA_ATTR_TYPE_CODE_ATTR, 0);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
else if (method && (!strcmp ((const char *) method->name, "<init>") || !strcmp ((const char *) method->name, "init"))) {
IFDBG eprintf ("FOund an init function.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
bin->entrypoint = method;
bin->entrypoint_code_attr = r_bin_java_get_attr_from_field (method, R_BIN_JAVA_ATTR_TYPE_CODE_ATTR, 0);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
else if (method && (!strcmp ((const char *) method->name, "<cinit>") || !strcmp ((const char *) method->name, "cinit"))) {
bin->cf2.this_class_entrypoint = method;
bin->cf2.this_class_entrypoint_code_attr = r_bin_java_get_attr_from_field (method, R_BIN_JAVA_ATTR_TYPE_CODE_ATTR, 0);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-04-05 04:16:17 +00:00
if (adv + offset > len) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Method: %d.\n", i);
break;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
IFDBG r_bin_java_print_field_summary(method);
}
}
bin->methods_size = adv;
return adv;
}
2014-06-25 02:11:43 +00:00
R_API int r_bin_java_new_bin (RBinJavaObj *bin, ut64 loadaddr, Sdb *kv, const ut8 * buf, ut64 len) {
R_BIN_JAVA_GLOBAL_BIN = bin;
bin->lines.count = 0;
bin->loadaddr = loadaddr;
r_bin_java_get_java_null_cp ();
bin->id = r_num_rand (UT32_MAX);
bin->kv = kv ? kv : sdb_new(NULL, NULL, 0);
bin->AllJavaBinObjs = NULL;
return r_bin_java_load_bin (bin, buf, len);
}
R_API int r_bin_java_load_bin (RBinJavaObj *bin, const ut8 * buf, ut64 buf_sz) {
ut64 adv = 0;
2014-03-30 17:29:29 +00:00
R_BIN_JAVA_GLOBAL_BIN = bin;
2015-09-14 00:08:31 +00:00
if (!bin) return false;
2014-03-30 17:29:29 +00:00
r_bin_java_reset_bin_info (bin);
memcpy ((ut8*) &bin->cf, buf, 10);
if (memcmp (bin->cf.cafebabe, "\xCA\xFE\xBA\xBE", 4)) {
eprintf ("r_bin_java_new_bin: Invalid header (%02x %02x %02x %02x)\n",
bin->cf.cafebabe[0], bin->cf.cafebabe[1],
bin->cf.cafebabe[2], bin->cf.cafebabe[3]);
2015-09-14 00:08:31 +00:00
return false;
}
if (bin->cf.major[0]==bin->cf.major[1] && bin->cf.major[0]==0) {
eprintf ("Java CLASS with MACH0 header?\n");
2015-09-14 00:08:31 +00:00
return false;
}
adv += 8;
// -2 so that the cp_count will be parsed
adv += r_bin_java_parse_cp_pool (bin, adv, buf, buf_sz);
2014-04-05 04:16:17 +00:00
if (adv > buf_sz) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Constant Pool.\n");
2015-09-14 00:08:31 +00:00
return true;
2014-04-05 04:16:17 +00:00
}
adv += r_bin_java_read_class_file2 (bin, adv, buf, buf_sz);
2014-04-05 04:16:17 +00:00
if (adv > buf_sz) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after class file info.\n");
2015-09-14 00:08:31 +00:00
return true;
2014-04-05 04:16:17 +00:00
}
IFDBG eprintf ("This class: %d %s\n", bin->cf2.this_class, bin->cf2.this_class_name);
IFDBG eprintf ("0x%"PFMT64x" Access flags: 0x%04x\n", adv, bin->cf2.access_flags);
adv += r_bin_java_parse_interfaces (bin, adv, buf, buf_sz);
2014-04-05 04:16:17 +00:00
if (adv > buf_sz) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Interfaces.\n");
2015-09-14 00:08:31 +00:00
return true;
2014-04-05 04:16:17 +00:00
}
adv += r_bin_java_parse_fields (bin, adv, buf, buf_sz);
2014-04-05 04:16:17 +00:00
if (adv > buf_sz) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Fields.\n");
2015-09-14 00:08:31 +00:00
return true;
2014-04-05 04:16:17 +00:00
}
adv += r_bin_java_parse_methods (bin, adv, buf, buf_sz);
2014-04-05 04:16:17 +00:00
if (adv > buf_sz) {
eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Methods.\n");
2015-09-14 00:08:31 +00:00
return true;
2014-04-05 04:16:17 +00:00
}
adv += r_bin_java_parse_attrs (bin, adv, buf, buf_sz);
bin->calc_size = adv;
2014-04-05 04:16:17 +00:00
//if (adv > buf_sz) {
// eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Attributes.\n");
2015-09-14 00:08:31 +00:00
// return true;
2014-04-05 04:16:17 +00:00
//}
2014-03-30 17:29:29 +00:00
//add_cp_objs_to_sdb(bin);
//add_method_infos_to_sdb(bin);
//add_field_infos_to_sdb(bin);
2015-09-14 00:08:31 +00:00
return true;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char* r_bin_java_get_version(RBinJavaObj* bin) {
return r_str_newf ("0x%02x%02x 0x%02x%02x",
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
bin->cf.major[1],bin->cf.major[0],
bin->cf.minor[1],bin->cf.minor[0]);
}
R_API RList * r_bin_java_get_entrypoints(RBinJavaObj* bin) {
RBinAddr *addr;
RListIter *iter = NULL, *iter_tmp=NULL;
RList *ret = r_list_new ();
RBinJavaField *fm_type;
if (!ret)
return NULL;
ret->free = free;
r_list_foreach_safe (bin->methods_list, iter, iter_tmp, fm_type) {
if (strcmp (fm_type->name, "main") == 0 ||
strcmp (fm_type->name, "<init>") == 0 ||
strcmp (fm_type->name, "<clinit>") == 0 ||
strstr (fm_type->flags_str, "static") != 0) {
addr = R_NEW0 (RBinAddr);
if (addr) {
addr->vaddr = addr->paddr = \
r_bin_java_get_method_code_offset (fm_type) + bin->loadaddr;
}
r_list_append (ret, addr);
}
}
return ret;
}
R_API RBinJavaField * r_bin_java_get_method_code_attribute_with_addr(RBinJavaObj *bin, ut64 addr) {
RListIter *iter = NULL, *iter_tmp=NULL;
RBinJavaField *fm_type, *res = NULL;
if (bin == NULL && R_BIN_JAVA_GLOBAL_BIN) bin = R_BIN_JAVA_GLOBAL_BIN;
else if (bin == NULL) {
eprintf("Attempting to analyse function when the R_BIN_JAVA_GLOBAL_BIN has not been set.\n");
return NULL;
}
r_list_foreach_safe (bin->methods_list, iter, iter_tmp, fm_type) {
ut64 offset = r_bin_java_get_method_code_offset(fm_type) + bin->loadaddr,
size = r_bin_java_get_method_code_size(fm_type);
if (addr >= offset && addr <= size + offset)
res = fm_type;
}
return res;
}
R_API RBinAddr * r_bin_java_get_entrypoint(RBinJavaObj* bin, int sym) {
RBinAddr *ret = NULL;
ret = R_NEW0 (RBinAddr);
if (!ret)
return NULL;
ret->paddr = UT64_MAX;
switch (sym) {
case R_BIN_SYM_ENTRY:
case R_BIN_SYM_INIT:
ret->paddr = r_bin_java_find_method_offset (bin, "<init>");
if (ret->paddr == UT64_MAX)
ret->paddr = r_bin_java_find_method_offset (bin, "<cinit>");
break;
case R_BIN_SYM_FINI:
ret->paddr = UT64_MAX;
break;
case R_BIN_SYM_MAIN:
ret->paddr = r_bin_java_find_method_offset (bin, "main");
break;
default:
ret->paddr = -1;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
if (ret->paddr != -1) ret->paddr += bin->loadaddr;
return ret;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API ut64 r_bin_java_get_method_code_size(RBinJavaField *fm_type) {
RListIter *attr_iter=NULL, *attr_iter_tmp=NULL;
RBinJavaAttrInfo *attr = NULL;
ut64 sz = 0;
r_list_foreach_safe (fm_type->attributes, attr_iter, attr_iter_tmp, attr) {
if (attr->type == R_BIN_JAVA_ATTR_TYPE_CODE_ATTR) {
sz = attr->info.code_attr.code_length;
break;
}
}
return sz;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_API ut64 r_bin_java_find_method_offset(RBinJavaObj *bin, const char* method_name) {
RListIter *attr_iter=NULL, *attr_iter_tmp=NULL;
RBinJavaField *method = NULL;
ut64 offset = -1;
r_list_foreach_safe (bin->methods_list, attr_iter, attr_iter_tmp, method) {
if(method && !strcmp ((const char *) method->name, method_name)) {
offset = r_bin_java_get_method_code_offset (method) + bin->loadaddr;
break;
}
}
return offset;
}
R_API ut64 r_bin_java_get_method_code_offset(RBinJavaField *fm_type) {
RListIter *attr_iter=NULL, *attr_iter_tmp=NULL;
RBinJavaAttrInfo *attr = NULL;
ut64 offset = 0;
r_list_foreach_safe (fm_type->attributes, attr_iter, attr_iter_tmp, attr) {
if (attr->type == R_BIN_JAVA_ATTR_TYPE_CODE_ATTR) {
offset = attr->info.code_attr.code_offset;
break;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
return offset;
}
2014-03-18 00:36:54 +00:00
R_API RBinField* r_bin_java_allocate_rbinfield() {
RBinField* t = (RBinField *) malloc (sizeof (RBinField));
if (t)
memset (t, 0, sizeof (RBinField));
return t;
}
R_API RBinField* r_bin_java_create_new_rbinfield_from_field(RBinJavaField *fm_type, ut64 baddr) {
RBinField *field = r_bin_java_allocate_rbinfield ();
if (field) {
2015-11-09 11:12:18 +00:00
field->name = strdup (fm_type->name);
field->paddr = fm_type->file_offset + baddr;
field->visibility = fm_type->flags;
}
return field;
}
R_API RBinSymbol* r_bin_java_create_new_symbol_from_field(RBinJavaField *fm_type, ut64 baddr) {
RBinSymbol *sym = R_NEW0 (RBinSymbol);
if (fm_type == NULL || fm_type->field_ref_cp_obj == NULL || fm_type->field_ref_cp_obj == &R_BIN_JAVA_NULL_TYPE) {
free (sym);
sym = NULL;
}
if (sym) {
sym->name = strdup (fm_type->name);
//strncpy (sym->type, fm_type->descriptor, R_BIN_SIZEOF_STRINGS);
if (fm_type->type == R_BIN_JAVA_FIELD_TYPE_METHOD) {
sym->type = r_str_const ("FUNC");
sym->paddr = r_bin_java_get_method_code_offset (fm_type);
sym->vaddr = r_bin_java_get_method_code_offset (fm_type) + baddr;
sym->size = r_bin_java_get_method_code_size (fm_type);
} else{
sym->type = r_str_const ("FIELD");
sym->paddr = fm_type->file_offset;//r_bin_java_get_method_code_offset (fm_type);
sym->vaddr = fm_type->file_offset + baddr;
sym->size = fm_type->size;
}
if (r_bin_java_is_fm_type_protected (fm_type)) {
sym->bind = r_str_const ("LOCAL");
} else if (r_bin_java_is_fm_type_private (fm_type)) {
sym->bind = r_str_const ("LOCAL");
} else if (r_bin_java_is_fm_type_protected (fm_type)) {
sym->bind = r_str_const ("GLOBAL");
}
sym->forwarder = r_str_const ("NONE");
if (fm_type->class_name) {
sym->classname = strdup (fm_type->class_name);
} else {
sym->classname = strdup ("UNKNOWN"); // dupped names?
}
sym->ordinal = fm_type->metas->ord;
sym->visibility = fm_type->flags;
if (fm_type->flags_str) {
sym->visibility_str = strdup (fm_type->flags_str);
}
}
return sym;
}
R_API RBinSymbol* r_bin_java_create_new_symbol_from_fm_type_meta(RBinJavaField *fm_type, ut64 baddr) {
RBinSymbol *sym = R_NEW0 (RBinSymbol);
if (fm_type == NULL || fm_type->field_ref_cp_obj == NULL || fm_type->field_ref_cp_obj == &R_BIN_JAVA_NULL_TYPE) {
free (sym);
sym = NULL;
}
if (sym) {
//ut32 new_name_len = strlen (fm_type->name) + strlen ("_meta") + 1;
//char *new_name = malloc (new_name_len);
sym->name = r_str_newf ("meta_%s", fm_type->name);
if (fm_type->type == R_BIN_JAVA_FIELD_TYPE_METHOD)
sym->type = r_str_const ("FUNC_META");
else sym->type = r_str_const ("FIELD_META");
if (r_bin_java_is_fm_type_protected (fm_type)) {
sym->bind = r_str_const ("LOCAL");
} else if (r_bin_java_is_fm_type_private (fm_type)) {
sym->bind = r_str_const ("LOCAL");
} else if (r_bin_java_is_fm_type_protected (fm_type)) {
sym->bind = r_str_const ("GLOBAL");
}
sym->forwarder = r_str_const ("NONE");
if (fm_type->class_name) {
sym->classname = strdup (fm_type->class_name);
} else {
sym->classname = strdup ("UNKNOWN");
}
sym->paddr = fm_type->file_offset;//r_bin_java_get_method_code_offset (fm_type);
sym->vaddr = fm_type->file_offset + baddr;
sym->ordinal = fm_type->metas->ord;
sym->size = fm_type->size;
sym->visibility = fm_type->flags;
if (fm_type->flags_str) {
sym->visibility_str = strdup (fm_type->flags_str);
}
}
return sym;
}
R_API RBinSymbol* r_bin_java_create_new_symbol_from_ref(RBinJavaCPTypeObj *obj, ut64 baddr) {
RBinSymbol *sym = R_NEW0(RBinSymbol);
char *class_name, *name, *type_name;
if (obj == NULL || (obj->tag != R_BIN_JAVA_CP_METHODREF &&
obj->tag != R_BIN_JAVA_CP_INTERFACEMETHOD_REF &&
obj->tag != R_BIN_JAVA_CP_FIELDREF)) {
free (sym);
sym = NULL;
return sym;
}
if (sym) {
class_name = r_bin_java_get_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN,
obj->info.cp_method.class_idx);
name = r_bin_java_get_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN,
obj->info.cp_method.name_and_type_idx);
type_name = r_bin_java_get_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN,
obj->info.cp_method.name_and_type_idx);
if (name) {
2015-11-09 11:12:18 +00:00
sym->name = name;
name = NULL;
}
if (type_name) {
sym->type = r_str_const (type_name);
R_FREE (type_name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
if (class_name)
2015-11-09 11:12:18 +00:00
sym->classname = strdup (class_name);
sym->paddr = obj->file_offset + baddr;
sym->vaddr = obj->file_offset + baddr;
sym->ordinal = obj->metas->ord;
sym->size = 0;
}
return sym;
}
R_API RList* r_bin_java_get_sections(RBinJavaObj *bin) {
2013-09-14 12:04:08 +00:00
RBinSection* section = NULL;
RList *sections = r_list_newf(free);
ut64 baddr = bin->loadaddr;
RBinJavaField *fm_type;
RListIter *iter = NULL;
if (bin->cp_count > 0) {
section = R_NEW0 (RBinSection);
if(section) {
strcpy (section->name, "constant_pool");
section->size = bin->cp_size;
section->paddr = bin->cp_offset + baddr;
section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
2015-12-12 21:27:17 +00:00
section->add = true;
r_list_append (sections, section);
}
section = NULL;
}
if (bin->fields_count > 0) {
section = R_NEW0 (RBinSection);
if (section) {
2015-04-12 11:35:35 +00:00
strcpy (section->name, "fields");
section->size = bin->fields_size;
section->paddr = bin->fields_offset + baddr;
section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
2015-12-12 21:27:17 +00:00
section->add = true;
r_list_append (sections, section);
2015-04-12 11:35:35 +00:00
section = NULL;
r_list_foreach (bin->fields_list, iter, fm_type) {
if (fm_type->attr_offset == 0) continue;
section = R_NEW0 (RBinSection);
if (section) {
2015-04-12 11:35:35 +00:00
snprintf (section->name, R_BIN_SIZEOF_STRINGS, "attrs.%s", fm_type->name);
section->size = fm_type->size - (fm_type->file_offset - fm_type->attr_offset);
section->paddr = fm_type->attr_offset + baddr;
section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
2015-12-12 21:27:17 +00:00
section->add = true;
2015-04-12 11:35:35 +00:00
r_list_append (sections, section);
}
}
}
}
if (bin->methods_count > 0) {
section = R_NEW0 (RBinSection);
if (section) {
2015-04-12 11:35:35 +00:00
strcpy (section->name, "methods");
section->size = bin->methods_size;
section->paddr = bin->methods_offset + baddr;
section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
2015-12-12 21:27:17 +00:00
section->add = true;
r_list_append (sections, section);
2015-04-12 11:35:35 +00:00
section = NULL;
r_list_foreach (bin->methods_list, iter, fm_type) {
if (fm_type->attr_offset == 0) continue;
section = R_NEW0 (RBinSection);
if (section) {
2015-04-12 11:35:35 +00:00
snprintf (section->name, R_BIN_SIZEOF_STRINGS, "attrs.%s", fm_type->name);
section->size = fm_type->size - (fm_type->file_offset - fm_type->attr_offset);
section->paddr = fm_type->attr_offset + baddr;
section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
2015-12-12 21:27:17 +00:00
section->add = true;
2015-04-12 11:35:35 +00:00
r_list_append (sections, section);
}
}
}
}
if (bin->interfaces_count > 0) {
section = R_NEW0 (RBinSection);
if(section) {
strcpy (section->name, "interfaces");
section->size = bin->interfaces_size;
section->paddr = bin->interfaces_offset + baddr;
section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
2015-12-12 21:27:17 +00:00
section->add = true;
r_list_append (sections, section);
}
section = NULL;
}
if (bin->attrs_count > 0) {
section = R_NEW0 (RBinSection);
if(section) {
strcpy (section->name, "attributes");
section->size = bin->attrs_size;
section->paddr = bin->attrs_offset + baddr;
section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
2015-12-12 21:27:17 +00:00
section->add = true;
r_list_append (sections, section);
}
section = NULL;
}
return sections;
}
R_API RList* r_bin_java_enum_class_methods(RBinJavaObj *bin, ut16 class_idx) {
RList* methods = r_list_newf (free);
2013-09-14 12:04:08 +00:00
RListIter *iter;
RBinJavaField *fm_type;
RBinSymbol *sym = NULL;
2013-09-14 12:04:08 +00:00
r_list_foreach (bin->methods_list, iter, fm_type) {
if (fm_type && fm_type->field_ref_cp_obj && \
fm_type->field_ref_cp_obj->metas->ord == class_idx) {
sym = r_bin_java_create_new_symbol_from_ref (
fm_type->field_ref_cp_obj, bin->loadaddr);
2013-09-14 12:04:08 +00:00
if (sym) r_list_append (methods, sym);
}
}
return methods;
}
R_API RList* r_bin_java_enum_class_fields(RBinJavaObj *bin, ut16 class_idx) {
RList* fields = r_list_newf (free);
RListIter *iter, *iter_tmp;
RBinJavaField *fm_type;
RBinField *field = NULL;
r_list_foreach_safe (bin->fields_list, iter, iter_tmp, fm_type) {
2013-09-14 12:04:08 +00:00
if (fm_type) {
if (fm_type && fm_type->field_ref_cp_obj
&& fm_type->field_ref_cp_obj->metas->ord == class_idx) {
field = r_bin_java_create_new_rbinfield_from_field (fm_type, bin->loadaddr);
if (field) r_list_append (fields, field);
}
}
}
return fields;
}
2014-06-25 02:11:43 +00:00
R_API int is_class_interface(RBinJavaObj *bin, RBinJavaCPTypeObj *cp_obj) {
RListIter *iter;
RBinJavaInterfaceInfo *ifobj;
2015-09-14 00:08:31 +00:00
int res = false;
r_list_foreach(bin->interfaces_list, iter, ifobj) {
if (ifobj) {
res = cp_obj == ifobj->cp_class;
if (res) break;
}
}
return res;
}
/*
R_API RList * r_bin_java_get_interface_classes(RBinJavaObj * bin) {
RList *interfaces_names = r_list_new();
RListIter *iter;
RBinJavaInterfaceInfo *ifobj;
r_list_foreach(bin->interfaces_list, iter, iinfo) {
RBinClass *class_ = R_NEW0 (RBinClass);
RBinJavaCPTypeObj *cp_obj = ;
if (ifobj && ifobj->name) {
ut8 * name = strdup(ifobj->name);
r_list_append(interfaces_names, name);
}
}
return interfaces_names;
}
*/
R_API RList * r_bin_java_get_lib_names(RBinJavaObj * bin) {
RList *lib_names = r_list_newf(free);
RListIter *iter;
RBinJavaCPTypeObj *cp_obj = NULL;
if (!bin) return lib_names;
r_list_foreach (bin->cp_list, iter, cp_obj) {
if (cp_obj &&
cp_obj->tag == R_BIN_JAVA_CP_CLASS &&
(bin->cf2.this_class != cp_obj->info.cp_class.name_idx || !is_class_interface(bin, cp_obj))) {
char * name = r_bin_java_get_item_name_from_bin_cp_list (bin, cp_obj);
r_list_append (lib_names, name);
}
}
return lib_names;
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_classes_free (void /*RBinClass*/ *c_) {
RBinClass *class_ = c_;
if (class_) {
r_list_free (class_->methods);
r_list_free (class_->fields);
free (class_->name);
free (class_->super);
free (class_->visibility_str);
free (class_);
}
}
R_API RList* r_bin_java_get_classes(RBinJavaObj *bin) {
RList *classes = r_list_newf (r_bin_java_classes_free);
RListIter *iter, *iter_tmp;
RBinJavaCPTypeObj *cp_obj = NULL;
RBinJavaCPTypeObj *this_class_cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, bin->cf2.this_class);
ut32 idx = 0;
RBinClass *k;
k = R_NEW0 (RBinClass);
2015-11-24 17:26:10 +00:00
if (!k) {
r_list_free (classes);
return NULL;
}
k->visibility = bin->cf2.access_flags;
if (bin->cf2.flags_str) {
k->visibility_str = strdup (bin->cf2.flags_str);
}
k->methods = r_bin_java_enum_class_methods (bin, bin->cf2.this_class);
k->fields = r_bin_java_enum_class_fields (bin, bin->cf2.this_class);
k->name = r_bin_java_get_this_class_name (bin);
k->super = r_bin_java_get_name_from_bin_cp_list (bin, bin->cf2.super_class);
k->index = (idx++);
r_list_append (classes, k);
r_list_foreach_safe (bin->cp_list, iter, iter_tmp, cp_obj) {
if (cp_obj && cp_obj->tag == R_BIN_JAVA_CP_CLASS
&& (this_class_cp_obj != cp_obj && is_class_interface (bin, cp_obj))) {
k = R_NEW0 (RBinClass);
if (!k) break;
k->methods = r_bin_java_enum_class_methods (bin, cp_obj->info.cp_class.name_idx);
k->fields = r_bin_java_enum_class_fields (bin, cp_obj->info.cp_class.name_idx);
k->index = idx;
k->name = r_bin_java_get_item_name_from_bin_cp_list (bin, cp_obj);
r_list_append (classes, k);
idx++;
}
}
return classes;
}
R_API RBinSymbol* r_bin_java_create_new_symbol_from_invoke_dynamic(RBinJavaCPTypeObj *obj, ut64 baddr) {
RBinSymbol *sym = NULL;
2013-09-14 12:04:08 +00:00
if (obj == NULL || (obj->tag != R_BIN_JAVA_CP_INVOKEDYNAMIC))
return sym;
return r_bin_java_create_new_symbol_from_cp_idx (obj->info.cp_invoke_dynamic.name_and_type_index, baddr);
}
R_API RBinSymbol* r_bin_java_create_new_symbol_from_cp_idx (ut32 cp_idx, ut64 baddr) {
RBinSymbol *sym = NULL;
2013-09-14 12:04:08 +00:00
RBinJavaCPTypeObj *obj = r_bin_java_get_item_from_bin_cp_list (
R_BIN_JAVA_GLOBAL_BIN, cp_idx);
if (obj) switch (obj->tag) {
case R_BIN_JAVA_CP_METHODREF:
case R_BIN_JAVA_CP_FIELDREF:
case R_BIN_JAVA_CP_INTERFACEMETHOD_REF:
sym = r_bin_java_create_new_symbol_from_ref (obj, baddr);
2013-09-14 12:04:08 +00:00
break;
case R_BIN_JAVA_CP_INVOKEDYNAMIC:
sym = r_bin_java_create_new_symbol_from_invoke_dynamic (obj, baddr);
2013-09-14 12:04:08 +00:00
break;
default:
break;
}
return sym;
}
2014-05-12 02:06:40 +00:00
R_API RList* U(r_bin_java_get_fields)(RBinJavaObj* bin) {
RListIter *iter = NULL, *iter_tmp=NULL;
RList *fields = r_list_new ();
RBinJavaField *fm_type;
RBinField *field;
r_list_foreach_safe (bin->fields_list, iter, iter_tmp, fm_type) {
field = r_bin_java_create_new_rbinfield_from_field (fm_type, bin->loadaddr);
if (field) r_list_append (fields, field);
}
return fields;
}
R_API void r_bin_add_import (RBinJavaObj * bin, RBinJavaCPTypeObj *obj, const char * type) {
RBinImport * imp = R_NEW0 (RBinImport);
char *class_name = r_bin_java_get_name_from_bin_cp_list (bin, obj->info.cp_method.class_idx);
char *name = r_bin_java_get_name_from_bin_cp_list (bin, obj->info.cp_method.name_and_type_idx);
char *descriptor = r_bin_java_get_desc_from_bin_cp_list (bin, obj->info.cp_method.name_and_type_idx);
class_name = class_name ? class_name : strdup ("INVALID CLASS NAME INDEX");
name = name ? name : strdup ("INVALID NAME INDEX");
descriptor = descriptor ? descriptor : strdup ("INVALID DESCRIPTOR INDEX");
imp->classname = class_name;
imp->name = name;
imp->bind = r_str_const ("NONE");
imp->type = r_str_const (type);
imp->descriptor = descriptor;
imp->ordinal = obj->idx;
r_list_append (bin->imports_list, imp);
}
R_API void r_bin_java_set_imports(RBinJavaObj* bin) {
RListIter *iter = NULL;
RBinJavaCPTypeObj *obj = NULL;
r_list_free (bin->imports_list);
bin->imports_list = r_list_newf (free);
r_list_foreach (bin->cp_list, iter, obj) {
const char *type = NULL;
switch (obj->tag) {
case R_BIN_JAVA_CP_METHODREF: type = "METHOD"; break;
case R_BIN_JAVA_CP_INTERFACEMETHOD_REF: type = "FIELD"; break;
case R_BIN_JAVA_CP_FIELDREF: type = "INTERFACE_METHOD"; break;
default: type = NULL; break;
}
if (type) r_bin_add_import (bin, obj, type);
}
}
R_API RList* r_bin_java_get_imports(RBinJavaObj* bin) {
RList *ret = r_list_newf (free);
RBinImport *import = NULL;
RListIter *iter;
r_list_foreach (bin->imports_list, iter, import) {
RBinImport *n_import = R_NEW0(RBinImport);
memcpy (n_import, import, sizeof (RBinImport));
r_list_append (ret, n_import);
}
return ret;
}
R_API RList* r_bin_java_get_symbols(RBinJavaObj* bin) {
RListIter *iter = NULL, *iter_tmp=NULL;
RList *imports, *symbols = r_list_newf (free);
RBinSymbol *sym;
RBinImport *imp;
RBinJavaField *fm_type;
sym = NULL;
r_list_foreach_safe (bin->methods_list, iter, iter_tmp, fm_type) {
sym = r_bin_java_create_new_symbol_from_field (fm_type, bin->loadaddr);
if(sym) r_list_append (symbols, (void *) sym);
sym = r_bin_java_create_new_symbol_from_fm_type_meta (fm_type, bin->loadaddr);
if(sym) r_list_append (symbols, (void *) sym);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
r_list_foreach_safe (bin->fields_list, iter, iter_tmp, fm_type) {
sym = r_bin_java_create_new_symbol_from_field (fm_type, bin->loadaddr);
if(sym) r_list_append (symbols, (void *) sym);
sym = r_bin_java_create_new_symbol_from_fm_type_meta (fm_type, bin->loadaddr);
if(sym) r_list_append (symbols, (void *) sym);
}
imports = r_bin_java_get_imports (bin);
r_list_foreach (imports, iter, imp) {
sym = R_NEW0 (RBinSymbol);
sym->name = strdup (sdb_fmt(0, "imp.%s", imp->name));
sym->type = r_str_const ("import");
sym->vaddr = sym->paddr = imp->ordinal;
sym->ordinal = imp->ordinal;
r_list_append (symbols, (void *)sym);
}
r_list_free (imports);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return symbols;
}
2013-09-14 12:04:08 +00:00
R_API RList* r_bin_java_get_strings(RBinJavaObj* bin) {
RList *strings = r_list_newf (free);
RBinString *str = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RListIter *iter = NULL, *iter_tmp=NULL;
RBinJavaCPTypeObj *cp_obj = NULL;
r_list_foreach_safe (bin->cp_list, iter, iter_tmp, cp_obj) {
if (cp_obj && cp_obj->tag == R_BIN_JAVA_CP_UTF8) {
str = (RBinString *) R_NEW0 (RBinString);
if (str) {
str->paddr = cp_obj->file_offset + bin->loadaddr;
str->ordinal = cp_obj->metas->ord;
2015-08-26 13:00:30 +00:00
str->size = cp_obj->info.cp_utf8.length + 3;
str->length = cp_obj->info.cp_utf8.length;
2015-11-09 20:54:57 +00:00
if (str->size>0) {
2015-11-13 21:38:07 +00:00
str->string = r_str_ndup ((const char *)
cp_obj->info.cp_utf8.bytes,
R_BIN_JAVA_MAXSTR);
2015-11-09 20:54:57 +00:00
}
r_list_append (strings, (void *) str);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
return strings;
}
R_API void* r_bin_java_free (RBinJavaObj* bin) {
char * bin_obj_key = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (!bin) return NULL;
// Delete the bin object from the data base.
bin_obj_key = r_bin_java_build_obj_key(bin);
//if (bin->AllJavaBinObjs && sdb_exists (bin->AllJavaBinObjs, bin_obj_key)) {
// sdb_unset (bin->AllJavaBinObjs, bin_obj_key, 0);
//}
free (bin_obj_key);
r_list_free (bin->imports_list);
// XXX - Need to remove all keys belonging to this class from
// the share meta information sdb.
// TODO e.g. iterate over bin->kv and delete all obj, func, etc. keys
//sdb_free (bin->kv);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// free up the constant pool list
r_list_free (bin->cp_list);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// free up the fields list
r_list_free (bin->fields_list);
// free up methods list
r_list_free (bin->methods_list);
// free up interfaces list
r_list_free (bin->interfaces_list);
r_list_free (bin->attrs_list);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// TODO: XXX if a class list of all inner classes
// are formed then this will need to be updated
free (bin->cf2.flags_str);
free (bin->cf2.this_class_name);
2014-03-30 17:29:29 +00:00
if (bin == R_BIN_JAVA_GLOBAL_BIN) R_BIN_JAVA_GLOBAL_BIN = NULL;
free (bin->file);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
free (bin);
return NULL;
}
R_API RBinJavaObj* r_bin_java_new_buf(RBuffer *buf, ut64 loadaddr, Sdb * kv) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaObj *bin = R_NEW0 (RBinJavaObj);
if (!bin) return NULL;
if (!r_bin_java_new_bin (bin, loadaddr, kv, buf->buf, buf->length))
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return r_bin_java_free (bin);
return bin;
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_attribute_free (void/*RBinJavaAttrInfo*/* a) {
RBinJavaAttrInfo *attr = a;
if (attr) {
IFDBG eprintf ("Deleting attr %s, %p\n", attr->name, attr);
((RBinJavaAttrMetas *) attr->metas->type_info)->allocs->delete_obj (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_constant_pool (void /*RBinJavaCPTypeObj*/ *o) {
RBinJavaCPTypeObj *obj = o;
if (obj != &R_BIN_JAVA_NULL_TYPE) {
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_fmtype_free (void /*RBinJavaField*/ * f) {
RBinJavaField *fm_type = f;
if (!fm_type) return;
free (fm_type->descriptor);
free (fm_type->name);
free (fm_type->flags_str);
free (fm_type->class_name);
free (fm_type->metas);
r_list_free (fm_type->attributes);
free (fm_type);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
// Start Free the various attribute types
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_unknown_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo *attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_local_variable_table_attr_entry_free (void /*RBinJavaLocalVariableAttribute*/* a) {
RBinJavaLocalVariableAttribute *lvattr = a;
if (lvattr) {
free (lvattr->descriptor);
free (lvattr->name);
free (lvattr);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_local_variable_table_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo *attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
r_list_free (attr->info.local_variable_table_attr.local_variable_table);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_local_variable_type_table_attr_entry_free (void /*RBinJavaLocalVariableTypeAttribute*/ *a) {
RBinJavaLocalVariableTypeAttribute* attr = a;
if (attr) {
free (attr->name);
free (attr->signature);
free (attr);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_local_variable_type_table_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if(attr) {
free (attr->name);
free (attr->metas);
r_list_free (attr->info.local_variable_type_table_attr.local_variable_table);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_deprecated_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_enclosing_methods_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr->info.enclosing_method_attr.class_name);
free (attr->info.enclosing_method_attr.method_name);
free (attr->info.enclosing_method_attr.method_descriptor);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_synthetic_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_constant_value_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_line_number_table_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
r_list_free (attr->info.line_number_table_attr.line_number_table);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_code_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
// XXX - Intentional memory leak here. When one of the
// Code attributes is parsed, the code (the r_bin_java)
// is not properly parsing the class file
r_bin_java_stack_frame_free (attr->info.code_attr.implicit_frame);
r_list_free (attr->info.code_attr.attributes);
free (attr->info.code_attr.code);
r_list_free (attr->info.code_attr.exception_table);
free (attr->name);
free (attr->metas);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
R_API void r_bin_java_exceptions_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr->info.exceptions_attr.exception_idx_table);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_inner_classes_attr_entry_free (void /*RBinJavaClassesAttribute*/ * a) {
RBinJavaClassesAttribute* attr = a;
if (attr) {
free (attr->name);
free (attr->flags_str);
free (attr);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_inner_classes_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
r_list_free (attr->info.inner_classes_attr.classes);
free (attr);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_signature_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr->info.signature_attr.signature);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_source_debug_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr->info.debug_extensions.debug_extension);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_source_code_file_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_stack_map_table_attr_free (void /*RBinJavaAttrInfo*/* a) {
RBinJavaAttrInfo* attr = a;
if (attr) {
free (attr->name);
free (attr->metas);
r_list_free (attr->info.stack_map_table_attr.stack_map_frame_entries);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_stack_frame_free (void /*RBinJavaStackMapFrame*/* o) {
RBinJavaStackMapFrame* obj = o;
if (obj) {
r_list_free (obj->local_items);
r_list_free (obj->stack_items);
free (obj->metas);
free (obj);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_verification_info_free (void /*RBinJavaVerificationObj*/ * o) {
RBinJavaVerificationObj *obj = o;
//eprintf ("Freeing verification object\n");
if(obj) {
free (obj->name);
free (obj);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_interface_free (void /*RBinJavaInterfaceInfo*/ *o) {
RBinJavaInterfaceInfo *obj = o;
2013-09-14 12:04:08 +00:00
if (obj) {
free (obj->name);
free (obj);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
// End Free the various attribute types
// Start the various attibute types new
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_attr_calc_size (RBinJavaAttrInfo *attr) {
return attr? ((RBinJavaAttrMetas *) attr->metas->type_info)->allocs->calc_size (attr): 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_unknown_attr_calc_size(RBinJavaAttrInfo *attr) {
return attr? 6: 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_unknown_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
return r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_code_attr_calc_size(RBinJavaAttrInfo *attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaExceptionEntry *exc_entry = NULL;
RBinJavaAttrInfo *_attr = NULL;
RListIter *iter, *iter_tmp;
ut64 size = 0;
if (attr) {
//attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 6;
//attr->info.code_attr.max_stack = R_BIN_JAVA_USHORT (buffer, 0);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//attr->info.code_attr.max_locals = R_BIN_JAVA_USHORT (buffer, 2);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//attr->info.code_attr.code_length = R_BIN_JAVA_UINT (buffer, 4);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
if (attr->info.code_attr.code) {
size += attr->info.code_attr.code_length;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
//attr->info.code_attr.exception_table_length = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
r_list_foreach_safe (attr->info.code_attr.exception_table, iter, iter_tmp, exc_entry) {
//exc_entry->start_pc = R_BIN_JAVA_USHORT (buffer,offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//exc_entry->end_pc = R_BIN_JAVA_USHORT (buffer,offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//exc_entry->handler_pc = R_BIN_JAVA_USHORT (buffer,offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//exc_entry->catch_type = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
}
//attr->info.code_attr.attributes_count = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
if (attr->info.code_attr.attributes_count > 0) {
r_list_foreach_safe (attr->info.code_attr.attributes, iter, iter_tmp, _attr) {
size += r_bin_java_attr_calc_size (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_code_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaAttrInfo *attr = NULL, *_attr = NULL;
ut32 k = 0, curpos;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (!attr) return NULL;
2015-05-29 16:41:58 +00:00
if (sz < 16 || sz > buf_offset) {//sz > buf_offset) {
2015-05-21 19:18:05 +00:00
free (attr);
return NULL;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
attr->type = R_BIN_JAVA_ATTR_TYPE_CODE_ATTR;
attr->info.code_attr.max_stack = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.code_attr.max_locals = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.code_attr.code_length = R_BIN_JAVA_UINT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 4;
// BUG: possible unsigned integer overflow here
attr->info.code_attr.code_offset = buf_offset + offset;
attr->info.code_attr.code = (ut8*) malloc (attr->info.code_attr.code_length);
if (attr->info.code_attr.code == NULL) {
eprintf ("Handling Code Attributes: Unable to allocate memory "
"(%u bytes) for a code.\n", attr->info.code_attr.code_length);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return attr;
}
R_BIN_JAVA_GLOBAL_BIN->current_code_attr = attr;
2015-05-29 12:15:10 +00:00
{
int len = attr->info.code_attr.code_length;
memset (attr->info.code_attr.code, 0, len);
if (offset + len >= sz) {
len = sz;
return attr;
}
memcpy (attr->info.code_attr.code, buffer+offset, len);
offset += len;
}
attr->info.code_attr.exception_table_length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.code_attr.exception_table = r_list_newf (free);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
for (k = 0; k < attr->info.code_attr.exception_table_length; k++) {
curpos = buf_offset+offset;
if (curpos + 8 > sz)
return attr;
RBinJavaExceptionEntry *e = R_NEW0 (RBinJavaExceptionEntry);
e->file_offset = curpos;
e->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
e->end_pc = R_BIN_JAVA_USHORT (buffer,offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
e->handler_pc = R_BIN_JAVA_USHORT (buffer,offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
e->catch_type = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
r_list_append (attr->info.code_attr.exception_table, e);
e->size = 8;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->info.code_attr.attributes_count = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
//IFDBG eprintf (" code Attributes_count: %d\n", attr->info.code_attr.attributes_count);
// XXX - attr->info.code_attr.attributes is not freed because one of the code attributes is improperly parsed.
attr->info.code_attr.attributes = r_list_newf (r_bin_java_attribute_free);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (attr->info.code_attr.attributes_count > 0) {
for (k = 0; k < attr->info.code_attr.attributes_count; k++) {
int size = (offset<sz)? sz - offset: 0;
2015-05-29 16:41:58 +00:00
if (size > sz || size <= 0) break;
_attr = r_bin_java_read_next_attr_from_buffer (buffer+offset, size, buf_offset+offset);
2014-04-05 04:16:17 +00:00
if (!_attr) {
eprintf ("[X] r_bin_java_code_attr_new: Error unable to parse remainder of classfile after Method's Code Attribute: %d.\n", k);
2014-04-05 04:16:17 +00:00
break;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
IFDBG eprintf ("Parsing @ 0x%"PFMT64x" (%s) = 0x%"PFMT64x" bytes, %p\n", _attr->file_offset, _attr->name, _attr->size, _attr);
2014-04-05 04:16:17 +00:00
offset += _attr->size;
r_list_append (attr->info.code_attr.attributes, _attr);
if (_attr->type == R_BIN_JAVA_ATTR_TYPE_LOCAL_VARIABLE_TABLE_ATTR) {
IFDBG eprintf ("Parsed the LocalVariableTable, preparing the implicit mthod frame.\n");
//r_bin_java_print_attr_summary(_attr);
attr->info.code_attr.implicit_frame = r_bin_java_build_stack_frame_from_local_variable_table (R_BIN_JAVA_GLOBAL_BIN, _attr);
attr->info.code_attr.implicit_frame->file_offset = buf_offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
IFDBG r_bin_java_print_stack_map_frame_summary(attr->info.code_attr.implicit_frame);
//r_list_append (attr->info.code_attr.attributes, attr->info.code_attr.implicit_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-04-05 04:16:17 +00:00
//if (offset > sz) {
// eprintf ("[X] r_bin_java: Error unable to parse remainder of classfile after Attribute: %d.\n", k);
// break;
//}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
if (attr->info.code_attr.implicit_frame == NULL) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// build a default implicit_frame
attr->info.code_attr.implicit_frame = r_bin_java_default_stack_frame ();
//r_list_append (attr->info.code_attr.attributes, attr->info.code_attr.implicit_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->size = offset;
return attr;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_constant_value_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
ut64 offset = 6;
RBinJavaAttrInfo* attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->type = R_BIN_JAVA_ATTR_TYPE_CONST_VALUE_ATTR;
attr->info.constant_value_attr.constantvalue_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->size = offset;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
//IFDBG r_bin_java_print_constant_value_attr_summary(attr);
return attr;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_constant_value_attr_calc_size(RBinJavaAttrInfo* attr) {
return attr? 8: 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_deprecated_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
2013-09-14 12:04:08 +00:00
RBinJavaAttrInfo* attr = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
if (attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->type = R_BIN_JAVA_ATTR_TYPE_DEPRECATED_ATTR;
attr->size = offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
//IFDBG r_bin_java_print_deprecated_attr_summary(attr);
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_deprecated_attr_calc_size(RBinJavaAttrInfo* attr) {
return attr? 6: 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_signature_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
ut64 offset = 6;
RBinJavaAttrInfo* attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (!attr) return NULL;
attr->type = R_BIN_JAVA_ATTR_TYPE_SIGNATURE_ATTR;
//attr->info.source_file_attr.sourcefile_idx = R_BIN_JAVA_USHORT (buffer, offset);
//offset += 2;
attr->info.signature_attr.signature_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.signature_attr.signature = r_bin_java_get_utf8_from_bin_cp_list (
R_BIN_JAVA_GLOBAL_BIN, attr->info.signature_attr.signature_idx);
if (!attr->info.signature_attr.signature)
eprintf ("r_bin_java_signature_attr_new: Unable to resolve the "
"Signature UTF8 String Index: 0x%02x\n", attr->info.signature_attr.signature_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->size = offset;
//IFDBG r_bin_java_print_source_code_file_attr_summary(attr);
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_signature_attr_calc_size(RBinJavaAttrInfo* attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
if (attr == NULL) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// TODO eprintf allocation fail
return size;
}
size += 6;
//attr->info.source_file_attr.sourcefile_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//attr->info.signature_attr.signature_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_enclosing_methods_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
ut64 offset = 6;
RBinJavaAttrInfo* attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (!attr) return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->type = R_BIN_JAVA_ATTR_TYPE_ENCLOSING_METHOD_ATTR;
attr->info.enclosing_method_attr.class_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.enclosing_method_attr.method_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.enclosing_method_attr.class_name = r_bin_java_get_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, attr->info.enclosing_method_attr.class_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (attr->info.enclosing_method_attr.class_name == NULL)
eprintf ("Could not resolve enclosing class name for the enclosed method.\n");
attr->info.enclosing_method_attr.method_name = r_bin_java_get_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, attr->info.enclosing_method_attr.method_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (attr->info.enclosing_method_attr.class_name == NULL)
eprintf ("Could not resolve method descriptor for the enclosed method.\n");
attr->info.enclosing_method_attr.method_descriptor = r_bin_java_get_desc_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, attr->info.enclosing_method_attr.method_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (attr->info.enclosing_method_attr.method_name == NULL)
eprintf ("Could not resolve method name for the enclosed method.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->size = offset;
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_enclosing_methods_attr_calc_size(RBinJavaAttrInfo *attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
if (attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 6;
//attr->info.enclosing_method_attr.class_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//attr->info.enclosing_method_attr.method_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_exceptions_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 i = 0, offset = 0;
2015-11-02 16:27:40 +00:00
ut64 size;
2013-09-14 12:04:08 +00:00
RBinJavaAttrInfo* attr = NULL;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
if (attr == NULL) {
// TODO eprintf
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return attr;
}
attr->type = R_BIN_JAVA_ATTR_TYPE_LINE_NUMBER_TABLE_ATTR;
attr->info.exceptions_attr.number_of_exceptions = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
2015-11-02 16:27:40 +00:00
size = sizeof (ut16) * attr->info.exceptions_attr.number_of_exceptions;
if (size < attr->info.exceptions_attr.number_of_exceptions) {
free (attr);
return NULL;
}
attr->info.exceptions_attr.exception_idx_table = (ut16 *) malloc (size);
for (i = 0; i < attr->info.exceptions_attr.number_of_exceptions; i++) {
attr->info.exceptions_attr.exception_idx_table[i] = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
}
attr->size = offset;
//IFDBG r_bin_java_print_exceptions_attr_summary(attr);
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_exceptions_attr_calc_size(RBinJavaAttrInfo *attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0, i = 0;
if (attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 6;
for (i = 0; i < attr->info.exceptions_attr.number_of_exceptions; i++) {
//attr->info.exceptions_attr.exception_idx_table[i] = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
}
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_inner_classes_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaClassesAttribute *icattr;
RBinJavaAttrInfo *attr = NULL;
2015-05-12 18:41:05 +00:00
RBinJavaCPTypeObj *obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 i = 0;
ut64 offset = 0, curpos;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
if (attr == NULL) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// TODO eprintf
return attr;
}
attr->type = R_BIN_JAVA_ATTR_TYPE_INNER_CLASSES_ATTR;
attr->info.inner_classes_attr.number_of_classes = R_BIN_JAVA_USHORT (buffer, offset);
2015-05-12 18:41:05 +00:00
offset += 2;
attr->info.inner_classes_attr.classes = r_list_newf (r_bin_java_inner_classes_attr_entry_free);
for (i = 0; i < attr->info.inner_classes_attr.number_of_classes; i++) {
curpos = buf_offset + offset;
icattr = R_NEW0(RBinJavaClassesAttribute);
icattr->inner_class_info_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
icattr->outer_class_info_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
icattr->inner_name_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
icattr->inner_class_access_flags = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
icattr->flags_str = retrieve_class_method_access_string(icattr->inner_class_access_flags);
icattr->file_offset = curpos;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
icattr->size = 8;
2015-05-12 18:41:05 +00:00
obj = r_bin_java_get_item_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, icattr->inner_name_idx);
if (obj == NULL) {
2015-05-12 18:41:05 +00:00
eprintf ("BINCPLIS IS HULL %d\n", icattr->inner_name_idx);
}
icattr->name = r_bin_java_get_item_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, obj);
if (icattr->name == NULL) {
2015-05-12 18:41:05 +00:00
obj = r_bin_java_get_item_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, icattr->inner_class_info_idx);
if (obj == NULL) {
2015-05-12 18:41:05 +00:00
eprintf ("BINCPLIST IS NULL %d\n", icattr->inner_class_info_idx);
}
icattr->name = r_bin_java_get_item_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, obj);
if (icattr->name == NULL) {
2015-05-12 18:41:05 +00:00
icattr->name = r_str_dup (NULL, "NULL");
eprintf ("r_bin_java_inner_classes_attr: Unable to find the name for %d index.\n", icattr->inner_name_idx);
}
2015-10-25 15:35:47 +00:00
}
2015-05-12 18:41:05 +00:00
IFDBG eprintf ("r_bin_java_inner_classes_attr: Inner class name %d is %s.\n", icattr->inner_name_idx, icattr->name);
r_list_append (attr->info.inner_classes_attr.classes, (void *) icattr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->size = offset;
//IFDBG r_bin_java_print_inner_classes_attr_summary(attr);
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_inner_class_attr_calc_size(RBinJavaClassesAttribute *icattr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
if (icattr) {
//icattr->inner_class_info_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//icattr->outer_class_info_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//icattr->inner_name_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//icattr->inner_class_access_flags = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_inner_classes_attr_calc_size(RBinJavaAttrInfo *attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaClassesAttribute *icattr = NULL;
RListIter *iter, *iter_tmp;
ut64 size = 6;
if (!attr) return 0;
r_list_foreach_safe (attr->info.inner_classes_attr.classes, iter, iter_tmp, icattr) {
size += r_bin_java_inner_class_attr_calc_size (icattr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_line_number_table_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 i = 0;
ut64 curpos, offset = 0;
RBinJavaLineNumberAttribute *lnattr;
RBinJavaAttrInfo *attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (!attr) return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
attr->type = R_BIN_JAVA_ATTR_TYPE_LINE_NUMBER_TABLE_ATTR;
attr->info.line_number_table_attr.line_number_table_length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.line_number_table_attr.line_number_table = r_list_newf (free);
ut32 linenum_len = attr->info.line_number_table_attr.line_number_table_length;
RList * linenum_list = attr->info.line_number_table_attr.line_number_table;
if (linenum_len > sz) {
return NULL;
}
for (i = 0; i < linenum_len; i++) {
curpos = buf_offset + offset;
// printf ("%llx %llx \n", curpos, sz);
// XXX if (curpos + 8 >= sz) break;
2015-10-24 21:36:26 +00:00
lnattr = R_NEW0 (RBinJavaLineNumberAttribute);
if (!lnattr) {
perror ("calloc");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
break;
}
lnattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
lnattr->line_number = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
lnattr->file_offset = curpos;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
lnattr->size = 4;
r_list_append (linenum_list, lnattr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->size = offset;
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_line_number_table_attr_calc_size(RBinJavaAttrInfo* attr) {
ut64 size = 6;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaLineNumberAttribute *lnattr;
RListIter *iter, *iter_tmp;
if (!attr) return 0LL;
r_list_foreach_safe (attr->info.line_number_table_attr.line_number_table, iter, iter_tmp, lnattr) {
//lnattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lnattr->line_number = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_source_debug_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
ut64 offset = 6;
RBinJavaAttrInfo *attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (!attr) return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->type = R_BIN_JAVA_ATTR_TYPE_SOURCE_DEBUG_EXTENTSION_ATTR;
if (attr->length == 0) {
eprintf ("r_bin_java_source_debug_attr_new: Attempting to allocate 0 bytes for debug_extension.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->info.debug_extensions.debug_extension = NULL;
return attr;
} else if ((attr->length+offset) > sz) {
eprintf ("r_bin_java_source_debug_attr_new: Expected %d bytes got %"
PFMT64d" bytes for debug_extension.\n", attr->length, (offset + sz));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->info.debug_extensions.debug_extension = (ut8 *) malloc (attr->length);
if (attr->info.debug_extensions.debug_extension && (attr->length > (sz-offset))) {
memcpy (attr->info.debug_extensions.debug_extension, buffer+offset, sz-offset);
} else if (attr->info.debug_extensions.debug_extension) {
memcpy (attr->info.debug_extensions.debug_extension, buffer+offset, attr->length);
} else {
eprintf ("r_bin_java_source_debug_attr_new: Unable to allocate the data for the debug_extension.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
offset += attr->length;
attr->size = offset;
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_source_debug_attr_calc_size(RBinJavaAttrInfo *attr) {
ut64 size = 6;
if (!attr) return 0LL;
if (attr->info.debug_extensions.debug_extension)
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += attr->length;
return size;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_local_variable_table_attr_calc_size(RBinJavaAttrInfo *attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
2015-11-20 15:53:58 +00:00
//ut64 offset = 0;
RListIter *iter;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaLocalVariableAttribute* lvattr = NULL;
if (!attr) return 0LL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 6;
//attr->info.local_variable_table_attr.table_length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
2015-11-20 15:53:58 +00:00
r_list_foreach (attr->info.local_variable_table_attr.local_variable_table, iter, lvattr) {
//lvattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lvattr->length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lvattr->name_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lvattr->descriptor_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lvattr->index = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_local_variable_table_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaLocalVariableAttribute* lvattr;
ut64 curpos = 0, offset = 6;
RBinJavaAttrInfo *attr;
ut32 i = 0;
if (!buffer || sz<1) return NULL;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (!attr) return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->type = R_BIN_JAVA_ATTR_TYPE_LOCAL_VARIABLE_TABLE_ATTR;
attr->info.local_variable_table_attr.table_length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.local_variable_table_attr.local_variable_table = \
r_list_newf (r_bin_java_local_variable_table_attr_entry_free);
2015-05-29 12:15:10 +00:00
for (i = 0; i < attr->info.local_variable_table_attr.table_length; i++) {
if (offset + 10 > sz) {
2015-05-29 12:15:10 +00:00
break;
}
curpos = buf_offset + offset;
lvattr = R_NEW0 (RBinJavaLocalVariableAttribute);
2015-05-29 12:15:10 +00:00
lvattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
2015-05-29 12:15:10 +00:00
lvattr->length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
2015-05-29 12:15:10 +00:00
lvattr->name_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
2015-05-29 12:15:10 +00:00
lvattr->descriptor_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
2015-05-29 12:15:10 +00:00
lvattr->index = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
lvattr->file_offset = curpos;
lvattr->name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, lvattr->name_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
lvattr->size = 10;
if (!lvattr->name) {
lvattr->name = strdup ("NULL");
eprintf ("r_bin_java_local_variable_table_attr_new: Unable to find the name for %d index.\n", lvattr->name_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
lvattr->descriptor = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, lvattr->descriptor_idx);
if (!lvattr->descriptor) {
lvattr->descriptor = strdup ("NULL");
eprintf ("r_bin_java_local_variable_table_attr_new: Unable to find the descriptor for %d index.\n", lvattr->descriptor_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
r_list_append (attr->info.local_variable_table_attr.local_variable_table, lvattr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->size = offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
//IFDBG r_bin_java_print_local_variable_table_attr_summary(attr);
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_local_variable_type_table_attr_calc_size(RBinJavaAttrInfo *attr) {
RList * list = attr->info.local_variable_type_table_attr.local_variable_table;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaLocalVariableTypeAttribute* lvattr;
2016-01-27 02:14:19 +00:00
RListIter *iter;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
if (attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 6;
// attr->info.local_variable_type_table_attr.table_length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
r_list_foreach (list, iter, lvattr) {
//lvattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lvattr->length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lvattr->name_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lvattr->signature_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//lvattr->index = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_local_variable_type_table_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaLocalVariableTypeAttribute* lvattr;
ut64 offset = 6;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 i = 0;
RBinJavaAttrInfo* attr = r_bin_java_default_attr_new (buffer, sz, 0);
if (!attr) return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->type = R_BIN_JAVA_ATTR_TYPE_LOCAL_VARIABLE_TYPE_TABLE_ATTR;
attr->info.local_variable_type_table_attr.table_length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->info.local_variable_type_table_attr.local_variable_table = r_list_newf (r_bin_java_local_variable_type_table_attr_entry_free);
for (i = 0; i < attr->info.local_variable_type_table_attr.table_length; i++) {
ut64 curpos = buf_offset + offset;
lvattr = R_NEW0 (RBinJavaLocalVariableTypeAttribute);
lvattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
lvattr->length = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
lvattr->name_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
lvattr->signature_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
lvattr->index = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
lvattr->file_offset = curpos;
lvattr->name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, lvattr->name_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
lvattr->size = 10;
if (!lvattr->name) {
lvattr->name = strdup ("NULL");
eprintf ("r_bin_java_local_variable_type_table_attr_new: Unable to find the name for %d index.\n", lvattr->name_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
lvattr->signature = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, lvattr->signature_idx);
if (!lvattr->signature) {
lvattr->signature = strdup ("NULL");
eprintf ("r_bin_java_local_variable_type_table_attr_new: Unable to find the descriptor for %d index.\n", lvattr->signature_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
r_list_append (attr->info.local_variable_type_table_attr.local_variable_table, lvattr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
//IFDBG r_bin_java_print_local_variable_type_table_attr_summary(attr);
attr->size = offset;
return attr;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_source_code_file_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
RBinJavaAttrInfo* attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
if (!attr) return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr->type = R_BIN_JAVA_ATTR_TYPE_SOURCE_FILE_ATTR;
attr->info.source_file_attr.sourcefile_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
attr->size = offset;
//IFDBG r_bin_java_print_source_code_file_attr_summary(attr);
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_source_code_file_attr_calc_size(RBinJavaAttrInfo* attr) {
return attr? 8: 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_synthetic_attr_new (ut8 *buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
2014-07-21 21:14:25 +00:00
RBinJavaAttrInfo* attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (!attr) return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
attr->type = R_BIN_JAVA_ATTR_TYPE_SYNTHETIC_ATTR;
attr->size = offset;
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_synthetic_attr_calc_size(RBinJavaAttrInfo* attr) {
return attr? 12: 6;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaInterfaceInfo* r_bin_java_interface_new (RBinJavaObj *bin, const ut8 *buffer, ut64 sz) {
RBinJavaInterfaceInfo *ifobj = NULL;
ifobj = R_NEW0(RBinJavaInterfaceInfo);
IFDBG eprintf("Parsing RBinJavaInterfaceInfo\n");
if (ifobj) {
if (buffer) {
ifobj->class_info_idx = R_BIN_JAVA_USHORT (buffer, 0);
ifobj->cp_class = r_bin_java_get_item_from_bin_cp_list (bin, ifobj->class_info_idx);
if (ifobj->cp_class) {
ifobj->name = r_bin_java_get_item_name_from_bin_cp_list (bin, ifobj->cp_class);
} else {
ifobj->name = r_str_dup (NULL, "NULL");
}
ifobj->size = 2;
} else {
ifobj->class_info_idx = 0;
ifobj->name = r_str_dup (NULL, "NULL");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
return ifobj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaVerificationObj* r_bin_java_verification_info_from_type(RBinJavaObj *bin, R_BIN_JAVA_STACKMAP_TYPE type, ut32 value) {
RBinJavaVerificationObj *se = R_NEW0 (RBinJavaVerificationObj);
if (!se) return NULL;
se->tag = type;
if (se->tag == R_BIN_JAVA_STACKMAP_OBJECT) {
se->info.obj_val_cp_idx = (ut16) value;
} else if (se->tag == R_BIN_JAVA_STACKMAP_UNINIT) {
/*if (bin->offset_sz == 4) {
se->info.uninit_offset = value;
} else {
se->info.uninit_offset = (ut16) value;
}*/
se->info.uninit_offset = (ut16) value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return se;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaVerificationObj* r_bin_java_read_from_buffer_verification_info_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
RBinJavaVerificationObj *se = R_NEW0 (RBinJavaVerificationObj);
if (!se) return NULL;
se->file_offset = buf_offset;
se->tag = buffer[offset];
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 1;
if (se->tag == R_BIN_JAVA_STACKMAP_OBJECT) {
/*if((offset + 2) <= sz) {
se->info.obj_val_cp_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
} else {
eprintf ("rbin_java_read_next_verification_info: Failed to read bytes for StackMapTable R_BIN_JAVA_STACKMAP_OBJECT Object.\n");
//r_bin_java_verification_info_free (se);
//return se;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}*/
se->info.obj_val_cp_idx = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
} else if (se->tag == R_BIN_JAVA_STACKMAP_UNINIT) {
/*if((offset + 2) <= sz) {
se->info.uninit_offset = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
} else {
eprintf ("rbin_java_read_next_verification_info: Failed to read bytes for StackMapTable R_BIN_JAVA_STACKMAP_UNINIT Object.\n");
//r_bin_java_verification_info_free (se);
//return se;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}*/
se->info.uninit_offset = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
}
if (R_BIN_JAVA_STACKMAP_UNINIT < se->tag) {
eprintf ("rbin_java_read_next_verification_info: Unknown Tag: 0x%02x\n", se->tag);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
se->size = offset;
return se;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API ut64 rbin_java_verification_info_calc_size(RBinJavaVerificationObj* se) {
ut64 sz = 1;
if (!se) return 0;
// r_buf_read_at (bin->b, offset, (ut8*)(&se->tag), 1)
switch (se->tag) {
case R_BIN_JAVA_STACKMAP_OBJECT:
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
//r_buf_read_at (bin->b, offset+1, (ut8*)buf, 2)
sz += 2;
break;
case R_BIN_JAVA_STACKMAP_UNINIT:
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
//r_buf_read_at (bin->b, offset+1, (ut8*)buf, 2)
sz += 2;
break;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return sz;
}
R_API RBinJavaStackMapFrameMetas* r_bin_java_determine_stack_frame_type(ut8 tag) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 type_value = 0;
if (tag < 64)
type_value = R_BIN_JAVA_STACK_FRAME_SAME;
else if (63 < tag && tag < 128)
type_value = R_BIN_JAVA_STACK_FRAME_SAME_LOCALS_1;
else if (247 < tag && tag < 251)
type_value = R_BIN_JAVA_STACK_FRAME_CHOP;
else if (tag == 251)
type_value = R_BIN_JAVA_STACK_FRAME_SAME_FRAME_EXTENDED;
else if (251 < tag && tag < 255)
type_value = R_BIN_JAVA_STACK_FRAME_APPEND;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
else if (tag == 255)
type_value = R_BIN_JAVA_STACK_FRAME_FULL_FRAME;
else
type_value = R_BIN_JAVA_STACK_FRAME_RESERVED;
return &R_BIN_JAVA_STACK_MAP_FRAME_METAS[type_value];
}
R_API ut64 r_bin_java_stack_map_frame_calc_size(RBinJavaStackMapFrame *sf) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
RListIter *iter, *iter_tmp;
RBinJavaVerificationObj *se;
if (sf) {
//sf->tag = buffer[offset];
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 1;
switch (sf->type) {
case R_BIN_JAVA_STACK_FRAME_SAME:
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// Nothing to read
break;
case R_BIN_JAVA_STACK_FRAME_SAME_LOCALS_1:
r_list_foreach_safe (sf->stack_items, iter, iter_tmp, se) {
size += rbin_java_verification_info_calc_size (se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
break;
case R_BIN_JAVA_STACK_FRAME_CHOP:
//sf->offset_delta = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
break;
case R_BIN_JAVA_STACK_FRAME_SAME_FRAME_EXTENDED:
//sf->offset_delta = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
r_list_foreach_safe (sf->stack_items, iter, iter_tmp, se) {
size += rbin_java_verification_info_calc_size (se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
break;
case R_BIN_JAVA_STACK_FRAME_APPEND:
//sf->offset_delta = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2 ;
r_list_foreach_safe (sf->stack_items, iter, iter_tmp, se) {
size += rbin_java_verification_info_calc_size (se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
break;
case R_BIN_JAVA_STACK_FRAME_FULL_FRAME:
//sf->offset_delta = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
//sf->number_of_locals = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
r_list_foreach_safe (sf->local_items, iter, iter_tmp, se) {
size += rbin_java_verification_info_calc_size (se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
//sf->number_of_stack_items = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
r_list_foreach_safe (sf->stack_items, iter, iter_tmp, se) {
size += rbin_java_verification_info_calc_size (se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
break;
default:
eprintf ("Unknown type\n");
break;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
return size;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API RBinJavaStackMapFrame* r_bin_java_stack_map_frame_new (ut8* buffer, ut64 sz, RBinJavaStackMapFrame *p_frame, ut64 buf_offset) {
RBinJavaStackMapFrame *stack_frame = r_bin_java_default_stack_frame ();
RBinJavaVerificationObj *se = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
if (!stack_frame) return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
stack_frame->tag = buffer[offset];
offset += 1;
stack_frame->metas->type_info = (void *) r_bin_java_determine_stack_frame_type (stack_frame->tag);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
stack_frame->type = ((RBinJavaStackMapFrameMetas *) stack_frame->metas->type_info)->type;
stack_frame->file_offset = buf_offset;
stack_frame->p_stack_frame = p_frame;
switch (stack_frame->type) {
case R_BIN_JAVA_STACK_FRAME_SAME:
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// Maybe? 1. Copy the previous frames locals and set the locals count.
//copy_type_info_to_stack_frame_list_up_to_idx (p_frame->local_items, stack_frame->local_items, idx);
if (p_frame)
stack_frame->number_of_locals = p_frame->number_of_locals;
2013-12-07 22:45:55 +00:00
else {
IFINT eprintf ("><?><\n");
IFDBG eprintf ("Unable to set previous stackframe with the number of locals (current info.code_attr.implicit_frame was probably not set :/)");
}
IFDBG eprintf ("r_bin_java_stack_map_frame_new: TODO Stack Frame Same Locals Condition is untested, so there may be issues.\n");
break;
case R_BIN_JAVA_STACK_FRAME_SAME_LOCALS_1:
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// 1. Read the stack type
stack_frame->number_of_stack_items = 1;
se = r_bin_java_read_from_buffer_verification_info_new (buffer+offset, sz-offset, buf_offset+offset);
IFDBG eprintf ("r_bin_java_stack_map_frame_new: Parsed R_BIN_JAVA_STACK_FRAME_SAME_LOCALS_1.\n");
if (se) {
offset += se->size;
} else {
eprintf ("r_bin_java_stack_map_frame_new: Unable to parse the Stack Items for the stack frame.\n");
r_bin_java_stack_frame_free (stack_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
r_list_append (stack_frame->stack_items, (void *) se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// Maybe? 3. Copy the previous frames locals and set the locals count.
//copy_type_info_to_stack_frame_list_up_to_idx (p_frame->local_items, stack_frame->local_items, idx);
if (p_frame)
stack_frame->number_of_locals = p_frame->number_of_locals;
2013-12-07 22:45:55 +00:00
else {
IFDBG eprintf ("Unable to set previous stackframe with the number of locals (current info.code_attr.implicit_frame was probably not set :/)");
}
IFDBG eprintf ("r_bin_java_stack_map_frame_new: TODO Stack Frame Same Locals 1 Stack Element Condition is untested, so there may be issues.\n");
break;
case R_BIN_JAVA_STACK_FRAME_CHOP:
// 1. Calculate the max index we want to copy from the list of the
// previous frames locals
IFDBG eprintf ("r_bin_java_stack_map_frame_new: Parsing R_BIN_JAVA_STACK_FRAME_CHOP.\n");
2014-05-12 02:06:40 +00:00
//ut16 k = 251 - stack_frame->tag;
/*,
idx = p_frame->number_of_locals - k;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
*/
// 2. read the uoffset value
stack_frame->offset_delta = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
// Maybe? 3. Copy the previous frames locals and set the locals count.
//copy_type_info_to_stack_frame_list_up_to_idx (p_frame->local_items, stack_frame->local_items, idx);
if (p_frame)
stack_frame->number_of_locals = p_frame->number_of_locals;
2013-12-07 22:45:55 +00:00
else {
IFINT eprintf ("><?><\n");
IFDBG eprintf ("Unable to set previous stackframe with the number of locals (current info.code_attr.implicit_frame was probably not set :/)");
}
IFDBG eprintf ("r_bin_java_stack_map_frame_new: TODO Stack Frame Chop Condition is untested, so there may be issues.\n");
break;
case R_BIN_JAVA_STACK_FRAME_SAME_FRAME_EXTENDED:
IFDBG eprintf ("r_bin_java_stack_map_frame_new: Parsing R_BIN_JAVA_STACK_FRAME_SAME_FRAME_EXTENDED.\n");
// 1. Read the uoffset
stack_frame->offset_delta = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
// 2. Read the stack element type
stack_frame->number_of_stack_items = 1;
se = r_bin_java_read_from_buffer_verification_info_new (buffer+offset, sz-offset, buf_offset+offset);
if(se) {
offset += se->size;
} else {
eprintf ("r_bin_java_stack_map_frame_new: Unable to parse the Stack Items for the stack frame.\n");
r_bin_java_stack_frame_free (stack_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
r_list_append (stack_frame->stack_items, (void *) se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// Maybe? 3. Copy the previous frames locals to the current locals
//copy_type_info_to_stack_frame_list_up_to_idx (p_frame->local_items, stack_frame->local_items, idx);
if (p_frame) {
stack_frame->number_of_locals = p_frame->number_of_locals;
} else {
2013-12-07 22:45:55 +00:00
IFINT eprintf ("><?><\n");
IFDBG eprintf ("Unable to set previous stackframe with the number of locals (current info.code_attr.implicit_frame was probably not set :/)");
}
IFDBG eprintf ("r_bin_java_stack_map_frame_new: TODO Stack Frame Same Locals Frame Stack 1 Extended Condition is untested, so there may be issues.\n");
break;
case R_BIN_JAVA_STACK_FRAME_APPEND:
IFDBG eprintf ("r_bin_java_stack_map_frame_new: Parsing R_BIN_JAVA_STACK_FRAME_APPEND.\n");
// 1. Calculate the max index we want to copy from the list of the
// previous frames locals
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut16 k = stack_frame->tag - 251,
i = 0;
// 2. Read the uoffset
stack_frame->offset_delta = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
// Maybe? 3. Copy the previous frames locals to the current locals
//copy_type_info_to_stack_frame_list_up_to_idx (p_frame->local_items, stack_frame->local_items, idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// 4. Read off the rest of the appended locals types
for (i=0; i < k; i++) {
IFDBG eprintf ("r_bin_java_stack_map_frame_new: Parsing verifying the k'th frame: %d of %d.\n", i, k);
se = r_bin_java_read_from_buffer_verification_info_new (buffer+offset, sz-offset, buf_offset+offset);
IFDBG eprintf ("r_bin_java_stack_map_frame_new: Completed Parsing\n");
if (se) {
offset += se->size;
} else {
eprintf ("r_bin_java_stack_map_frame_new: Unable to parse the locals for the stack frame.\n");
r_bin_java_stack_frame_free (stack_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
r_list_append (stack_frame->local_items, (void *) se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
IFDBG eprintf ("r_bin_java_stack_map_frame_new: Breaking out of loop");
IFDBG eprintf("p_frame: %p\n", p_frame);
if (p_frame)
stack_frame->number_of_locals = p_frame->number_of_locals + k;
2013-12-07 22:45:55 +00:00
else {
IFINT eprintf ("><?><\n");
IFDBG eprintf ("Unable to set previous stackframe with the number of locals (current info.code_attr.implicit_frame was probably not set :/)");
}
IFDBG eprintf ("r_bin_java_stack_map_frame_new: TODO Stack Frame Same Locals Frame Stack 1 Extended Condition is untested, so there may be issues.\n");
break;
case R_BIN_JAVA_STACK_FRAME_FULL_FRAME:
IFDBG eprintf ("r_bin_java_stack_map_frame_new: Parsing R_BIN_JAVA_STACK_FRAME_FULL_FRAME.\n");
stack_frame->offset_delta = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
//IFDBG eprintf ("r_bin_java_stack_map_frame_new: Code Size > 65535, read(%d bytes), offset = 0x%08x.\n", var_sz, stack_frame->offset_delta);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// Read the number of variables based on the max # local variable
stack_frame->number_of_locals = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
//IFDBG eprintf ("r_bin_java_stack_map_frame_new: Max ulocalvar > 65535, read(%d bytes), number_of_locals = 0x%08x.\n", var_sz, stack_frame->number_of_locals);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
IFDBG r_bin_java_print_stack_map_frame_summary(stack_frame);
// read the number of locals off the stack
for (i = 0; i < stack_frame->number_of_locals; i++) {
se = r_bin_java_read_from_buffer_verification_info_new (buffer+offset, sz-offset, buf_offset+offset);
if (se) {
offset += se->size;
//r_list_append (stack_frame->local_items, (void *) se);
} else {
eprintf ("r_bin_java_stack_map_frame_new: Unable to parse the locals for the stack frame.\n");
r_bin_java_stack_frame_free (stack_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
r_list_append (stack_frame->local_items, (void *) se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
// Read the number of stack items based on the max size of stack
stack_frame->number_of_stack_items = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
//IFDBG eprintf ("r_bin_java_stack_map_frame_new: Max ustack items > 65535, read(%d bytes), number_of_locals = 0x%08x.\n", var_sz, stack_frame->number_of_stack_items);
// read the stack items
for (i = 0; i < stack_frame->number_of_stack_items; i++) {
se = r_bin_java_read_from_buffer_verification_info_new (buffer+offset, sz-offset, buf_offset+offset);
if(se) {
offset += se->size;
// r_list_append (stack_frame->stack_items, (void *) se);
} else {
2016-02-16 20:46:12 +00:00
eprintf ("r_bin_java_stack_map_frame_new: Unable to parse the stack items for the stack frame.\n");
r_bin_java_stack_frame_free (stack_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
r_list_append (stack_frame->local_items, (void *) se);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
break;
default:
eprintf ("java: Unknown type\n");
break;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
//IFDBG eprintf ("Created a stack frame at offset(0x%08"PFMT64x") of size: %d\n", buf_offset, stack_frame->size);//r_bin_java_print_stack_map_frame_summary(stack_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
stack_frame->size = offset;
//IFDBG r_bin_java_print_stack_map_frame_summary(stack_frame);
return stack_frame;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut16 r_bin_java_find_cp_class_ref_from_name_idx (RBinJavaObj *bin, ut16 name_idx) {
ut16 pos, len = (ut16) r_list_length (bin->cp_list);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaCPTypeObj *item;
for (pos = 0; pos < len; pos++) {
item = (RBinJavaCPTypeObj *) r_list_get_n (bin->cp_list, pos);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
if (item && item->tag == R_BIN_JAVA_CP_CLASS && item->info.cp_class.name_idx == name_idx)
break;
}
return (pos != len)? pos: 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2015-11-20 15:53:58 +00:00
R_API RBinJavaStackMapFrame* r_bin_java_default_stack_frame() {
RBinJavaStackMapFrame* sf = R_NEW0 (RBinJavaStackMapFrame);
if (!sf) return NULL;
sf->metas = R_NEW0 (RBinJavaMetaInfo);
if (!sf->metas) {
free (sf);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return NULL;
}
sf->metas->type_info = (void *) &R_BIN_JAVA_STACK_MAP_FRAME_METAS[R_BIN_JAVA_STACK_FRAME_IMPLICIT];
sf->type = ((RBinJavaStackMapFrameMetas *) sf->metas->type_info)->type;
sf->local_items = r_list_newf (r_bin_java_verification_info_free);
sf->stack_items = r_list_newf (r_bin_java_verification_info_free);
sf->number_of_stack_items = 0;
sf->number_of_locals = 0;
return sf;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2015-11-20 15:08:06 +00:00
R_API RBinJavaStackMapFrame* r_bin_java_build_stack_frame_from_local_variable_table(RBinJavaObj *bin, RBinJavaAttrInfo *attr) {
RBinJavaStackMapFrame *sf = r_bin_java_default_stack_frame();
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RBinJavaLocalVariableAttribute *lvattr = NULL;
RBinJavaVerificationObj *type_item;
2015-11-20 15:53:58 +00:00
RListIter *iter = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 value_cnt = 0;
ut8 value;
if (!sf || !bin || !attr || attr->type != R_BIN_JAVA_ATTR_TYPE_LOCAL_VARIABLE_TABLE_ATTR) {
eprintf ("Attempting to create a stack_map frame from a bad attribute.\n");
return sf;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
sf->number_of_locals = attr->info.local_variable_table_attr.table_length;
2015-11-20 15:53:58 +00:00
r_list_foreach (attr->info.local_variable_table_attr.local_variable_table, iter, lvattr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 pos = 0;
// knock the array Types
while (lvattr->descriptor[pos] == '[') {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
pos ++;
}
value = lvattr->descriptor[pos];
//IFDBG eprintf ("Found the following type value: %c at pos %d in %s\n", value, pos, lvattr->descriptor);
switch (value) {
case 'I':
case 'Z':
case 'S':
case 'B':
case 'C':
type_item = r_bin_java_verification_info_from_type (bin, R_BIN_JAVA_STACKMAP_INTEGER, 0);
break;
case 'F':
type_item = r_bin_java_verification_info_from_type (bin, R_BIN_JAVA_STACKMAP_FLOAT, 0);
break;
case 'D':
type_item = r_bin_java_verification_info_from_type (bin, R_BIN_JAVA_STACKMAP_DOUBLE, 0);
break;
case 'J':
type_item = r_bin_java_verification_info_from_type (bin, R_BIN_JAVA_STACKMAP_LONG, 0);
break;
case 'L':
// TODO: FIXME write something that will iterate over the CP Pool and find the
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// CONSTANT_Class_info referencing this
{
ut16 idx = r_bin_java_find_cp_class_ref_from_name_idx (bin, lvattr->name_idx);
type_item = r_bin_java_verification_info_from_type (bin, R_BIN_JAVA_STACKMAP_OBJECT, idx);
}
break;
default:
2015-11-20 15:08:06 +00:00
eprintf ("r_bin_java_build_stack_frame_from_local_variable_table: "
"not sure how to handle: name: %s, type: %s\n", lvattr->name, lvattr->descriptor);
type_item = r_bin_java_verification_info_from_type (bin, R_BIN_JAVA_STACKMAP_NULL, 0);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
if (type_item) r_list_append (sf->local_items, (void *)type_item);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
value_cnt++;
}
if (value_cnt != attr->info.local_variable_table_attr.table_length) {
2015-11-20 15:08:06 +00:00
IFDBG eprintf ("r_bin_java_build_stack_frame_from_local_variable_table: "
"Number of locals not accurate. Expected %d but got %d",
attr->info.local_variable_table_attr.table_length, value_cnt);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return sf;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_stack_map_table_attr_calc_size(RBinJavaAttrInfo* attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
RListIter *iter, *iter_tmp;
RBinJavaStackMapFrame *sf;
if (attr) {
//attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 6;
//IFDBG r_bin_java_print_source_code_file_attr_summary(attr);
// Current spec does not call for variable sizes.
//attr->info.stack_map_table_attr.number_of_entries = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
r_list_foreach_safe (attr->info.stack_map_table_attr.stack_map_frame_entries, iter, iter_tmp, sf) {
size += r_bin_java_stack_map_frame_calc_size (sf);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return size;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_stack_map_table_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 i = 0;
ut64 offset = 0;
RBinJavaStackMapFrame *stack_frame = NULL, *new_stack_frame = NULL;
RBinJavaAttrInfo *attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
IFDBG eprintf ("r_bin_java_stack_map_table_attr_new: New stack map allocated.\n");
if (!attr) return NULL;
attr->info.stack_map_table_attr.stack_map_frame_entries = r_list_newf (r_bin_java_stack_frame_free);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
//IFDBG r_bin_java_print_source_code_file_attr_summary(attr);
// Current spec does not call for variable sizes.
attr->info.stack_map_table_attr.number_of_entries = R_BIN_JAVA_USHORT (buffer, offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 2;
IFDBG eprintf ("r_bin_java_stack_map_table_attr_new: Processing stack map, summary is:\n");
IFDBG r_bin_java_print_stack_map_table_attr_summary(attr);
for(i=0; i < attr->info.stack_map_table_attr.number_of_entries; i++) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// read next stack frame
IFDBG eprintf ("Reading StackMap Entry #%d @ 0x%08"PFMT64x"\n", i, buf_offset+offset);
if (stack_frame == NULL && R_BIN_JAVA_GLOBAL_BIN && R_BIN_JAVA_GLOBAL_BIN->current_code_attr) {
IFDBG eprintf ("Setting an implicit frame at #%d @ 0x%08"PFMT64x"\n", i, buf_offset+offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
stack_frame = R_BIN_JAVA_GLOBAL_BIN->current_code_attr->info.code_attr.implicit_frame;
}
IFDBG eprintf ("Reading StackMap Entry #%d @ 0x%08"PFMT64x", current stack_frame: %p\n", i, buf_offset+offset, stack_frame);
new_stack_frame = r_bin_java_stack_map_frame_new (buffer+offset, sz-offset, stack_frame, buf_offset+offset);
if (new_stack_frame) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += new_stack_frame->size;
// append stack frame to the list
r_list_append (attr->info.stack_map_table_attr.stack_map_frame_entries, (void *) new_stack_frame);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
stack_frame = new_stack_frame;
} else {
2016-02-16 20:46:12 +00:00
eprintf ("r_bin_java_stack_map_table_attr_new: Unable to parse the stack frame for the stack map table.\n");
r_bin_java_stack_map_table_attr_free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
attr = NULL;
break;
}
}
if (attr) attr->size = offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return attr;
}
// End attribute types new
// Start new Constant Pool Types
R_API RBinJavaCPTypeObj* r_bin_java_do_nothing_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return (RBinJavaCPTypeObj *)NULL;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_do_nothing_calc_size(RBinJavaCPTypeObj *obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return 0;
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_do_nothing_free (void /*RBinJavaCPTypeObj*/ *obj) {
return;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaCPTypeObj* r_bin_java_unknown_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj = NULL;
obj = (RBinJavaCPTypeObj*) malloc (sizeof (RBinJavaCPTypeObj));
if (obj) {
memset (obj, 0, sizeof (RBinJavaCPTypeObj));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[R_BIN_JAVA_CP_UNKNOWN];
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_unknown_cp_calc_size(RBinJavaCPTypeObj* obj) {
return 1LL;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_API RBinJavaCPTypeObj* r_bin_java_class_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
int quick_check = r_bin_java_quick_check (R_BIN_JAVA_CP_CLASS, tag, sz, "Class");
if (quick_check > 0) return NULL;
RBinJavaCPTypeObj *obj = R_NEW0 (RBinJavaCPTypeObj);
if (obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->info.cp_class.name_idx = R_BIN_JAVA_USHORT (buffer, 1);
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_class_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
//ut8 tag = buffer[0];
size += 1;
//obj->info.cp_class.name_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 2;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_fieldref_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj = NULL;
int quick_check = 0;
quick_check = r_bin_java_quick_check (R_BIN_JAVA_CP_FIELDREF, tag, sz, "FieldRef");
if (quick_check > 0) {
return obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
obj = (RBinJavaCPTypeObj*) malloc (sizeof (RBinJavaCPTypeObj));
if (obj) {
memset (obj, 0, sizeof (RBinJavaCPTypeObj));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->info.cp_field.class_idx = R_BIN_JAVA_USHORT (buffer, 1);
obj->info.cp_field.name_and_type_idx = R_BIN_JAVA_USHORT (buffer, 3);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return (RBinJavaCPTypeObj*) obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_fieldref_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
// tag
size += 1;
//obj->info.cp_field.class_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 2;
//obj->info.cp_field.name_and_type_idx = R_BIN_JAVA_USHORT (buffer, 3);
size += 2;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_methodref_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj = NULL;
int quick_check = 0;
quick_check = r_bin_java_quick_check(R_BIN_JAVA_CP_METHODREF, tag, sz, "MethodRef");
if (quick_check > 0) {
return obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
obj = (RBinJavaCPTypeObj *) malloc (sizeof (RBinJavaCPTypeObj));
if (obj) {
memset (obj, 0, sizeof (RBinJavaCPTypeObj));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->info.cp_method.class_idx = R_BIN_JAVA_USHORT (buffer, 1);
obj->info.cp_method.name_and_type_idx = R_BIN_JAVA_USHORT (buffer, 3);
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_methodref_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
// tag
size += 1;
//obj->info.cp_method.class_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 2;
//obj->info.cp_method.name_and_type_idx = R_BIN_JAVA_USHORT (buffer, 3);
size += 2;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_interfacemethodref_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
int quick_check = r_bin_java_quick_check(R_BIN_JAVA_CP_INTERFACEMETHOD_REF, tag, sz, "InterfaceMethodRef");
if (quick_check > 0) return NULL;
RBinJavaCPTypeObj *obj = R_NEW0 (RBinJavaCPTypeObj);
if (obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->info.cp_interface.class_idx = R_BIN_JAVA_USHORT (buffer, 1);
obj->info.cp_interface.name_and_type_idx = R_BIN_JAVA_USHORT (buffer, 3);
}
return obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_interfacemethodref_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
// tag
size += 1;
//obj->info.cp_interface.class_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 2;
//obj->info.cp_interface.name_and_type_idx = R_BIN_JAVA_USHORT (buffer, 3);
size += 2;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_string_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
int quick_check = r_bin_java_quick_check(R_BIN_JAVA_CP_STRING, tag, sz, "String");
if (quick_check > 0) return NULL;
RBinJavaCPTypeObj *obj = R_NEW0 (RBinJavaCPTypeObj);
if (obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->info.cp_string.string_idx = R_BIN_JAVA_USHORT (buffer, 1);
}
return obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_string_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
// tag
size += 1;
//obj->info.cp_string.string_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 2;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_integer_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj = NULL;
int quick_check = 0;
quick_check = r_bin_java_quick_check(R_BIN_JAVA_CP_INTEGER, tag, sz, "Integer");
if (quick_check > 0) {
return obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
obj = (RBinJavaCPTypeObj *) malloc (sizeof (RBinJavaCPTypeObj));
if (obj) {
memset (obj, 0, sizeof (RBinJavaCPTypeObj));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);
memset (&obj->info.cp_integer.bytes, 0, sizeof (obj->info.cp_integer.bytes));
memcpy (&obj->info.cp_integer.bytes.raw, buffer+1, 4);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_integer_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
// tag
size += 1;
//obj->info.cp_string.string_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 4;
return size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaCPTypeObj* r_bin_java_float_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj = NULL;
int quick_check = 0;
quick_check = r_bin_java_quick_check (R_BIN_JAVA_CP_FLOAT, tag, sz, "Float");
if (quick_check > 0) {
return obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
obj = (RBinJavaCPTypeObj *) calloc (1, sizeof (RBinJavaCPTypeObj));
if (obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);
memset (&obj->info.cp_float.bytes, 0, sizeof (obj->info.cp_float.bytes));
memcpy (&obj->info.cp_float.bytes.raw, buffer, 4);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return (RBinJavaCPTypeObj*) obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_float_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
// tag
size += 1;
//obj->info.cp_string.string_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 4;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_long_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj = NULL;
int quick_check = 0;
quick_check = r_bin_java_quick_check (R_BIN_JAVA_CP_LONG, tag, sz, "Long");
if (quick_check > 0) {
return obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
obj = (RBinJavaCPTypeObj *) malloc (sizeof (RBinJavaCPTypeObj));
if (obj) {
memset (obj, 0, sizeof (RBinJavaCPTypeObj));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);
memset (&obj->info.cp_long.bytes, 0, sizeof (obj->info.cp_long.bytes));
memcpy (&(obj->info.cp_long.bytes), buffer+1, 8);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_long_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
// tag
size += 1;
//obj->info.cp_string.string_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 8;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_double_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj = NULL;
int quick_check = 0;
quick_check = r_bin_java_quick_check(R_BIN_JAVA_CP_DOUBLE, tag, sz, "Double");
if (quick_check > 0) {
return (RBinJavaCPTypeObj*) obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
obj = (RBinJavaCPTypeObj *) malloc (sizeof (RBinJavaCPTypeObj));
if (obj) {
memset (obj, 0, sizeof (RBinJavaCPTypeObj));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);
memset (&obj->info.cp_double.bytes, 0, sizeof (obj->info.cp_double.bytes));
memcpy (&obj->info.cp_double.bytes, buffer+1, 8);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_double_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
// tag
size += 1;
//obj->info.cp_string.string_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 8;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_utf8_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj;
int quick_check = r_bin_java_quick_check (R_BIN_JAVA_CP_UTF8, tag, sz, "Utf8");
if (quick_check > 0) return NULL;
if ((obj = R_NEW0 (RBinJavaCPTypeObj))) {
memset (obj, 0, sizeof (RBinJavaCPTypeObj));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->info.cp_utf8.length = R_BIN_JAVA_USHORT (buffer, 1);
obj->info.cp_utf8.bytes = (ut8 *) malloc (obj->info.cp_utf8.length+1);
if (obj->info.cp_utf8.bytes) {
memset (obj->info.cp_utf8.bytes, 0, obj->info.cp_utf8.length+1);
if (obj->info.cp_utf8.length < (sz - 3)) {
memcpy (obj->info.cp_utf8.bytes, buffer+3, (sz - 3));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->info.cp_utf8.length = sz - 3;
} else {
memcpy (obj->info.cp_utf8.bytes, buffer+3, obj->info.cp_utf8.length);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
obj->value = obj->info.cp_utf8.bytes;
} else {
r_bin_java_obj_free (obj);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj = NULL;
}
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_utf8_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
size += 1;
if (obj && R_BIN_JAVA_CP_UTF8 == obj->tag) {
size += 2;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += obj->info.cp_utf8.length;
}
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_name_and_type_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj = NULL;
int quick_check = 0;
quick_check = r_bin_java_quick_check(R_BIN_JAVA_CP_NAMEANDTYPE, tag, sz, "RBinJavaCPTypeNameAndType");
if (quick_check > 0) {
return obj;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
obj = (RBinJavaCPTypeObj *) malloc (sizeof (RBinJavaCPTypeObj));
if (obj) {
memset (obj, 0, sizeof (RBinJavaCPTypeObj));
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->info.cp_name_and_type.name_idx = R_BIN_JAVA_USHORT (buffer, 1);
obj->info.cp_name_and_type.descriptor_idx = R_BIN_JAVA_USHORT (buffer, 3);
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_name_and_type_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
if (obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 1;
//obj->info.cp_name_and_type.name_idx = R_BIN_JAVA_USHORT (buffer, 1);
size += 2;
//obj->info.cp_name_and_type.descriptor_idx = R_BIN_JAVA_USHORT (buffer, 3);
size += 2;
}
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_methodtype_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
int quick_check = r_bin_java_quick_check (R_BIN_JAVA_CP_METHODTYPE, tag, sz, "RBinJavaCPTypeMethodType");
if (quick_check > 0) return NULL;
RBinJavaCPTypeObj *obj = R_NEW0 (RBinJavaCPTypeObj);
if (obj) {
obj->metas = R_NEW0 (RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->info.cp_method_type.descriptor_index = R_BIN_JAVA_USHORT (buffer, 1);
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_methodtype_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
size += 1;
// obj->info.cp_method_type.descriptor_index = R_BIN_JAVA_USHORT (buffer, 1);
size += 2;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_methodhandle_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
int quick_check = r_bin_java_quick_check (R_BIN_JAVA_CP_METHODHANDLE, tag, sz, "RBinJavaCPTypeMethodHandle");
if (quick_check > 0) return NULL;
RBinJavaCPTypeObj *obj = R_NEW0 (RBinJavaCPTypeObj);
if (obj) {
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->info.cp_method_handle.reference_kind = buffer[1];
obj->info.cp_method_handle.reference_index = R_BIN_JAVA_USHORT (buffer, 2);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_methodhandle_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
size += 1;
//obj->info.cp_method_handle.reference_index = R_BIN_JAVA_USHORT (buffer, 2);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
return size;
}
R_API RBinJavaCPTypeObj* r_bin_java_invokedynamic_cp_new (RBinJavaObj *bin, ut8* buffer, ut64 sz) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut8 tag = buffer[0];
RBinJavaCPTypeObj *obj;
int quick_check = r_bin_java_quick_check(R_BIN_JAVA_CP_INVOKEDYNAMIC, tag, sz, "RBinJavaCPTypeMethodHandle");
if (quick_check > 0) return NULL;
if ((obj = R_NEW0 (RBinJavaCPTypeObj))) {
obj->metas = R_NEW0(RBinJavaMetaInfo);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
obj->name = r_str_dup (NULL, (const char *) R_BIN_JAVA_CP_METAS[tag].name);;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
obj->tag = tag;
obj->info.cp_invoke_dynamic.bootstrap_method_attr_index = R_BIN_JAVA_USHORT (buffer, 1);
obj->info.cp_invoke_dynamic.name_and_type_index = R_BIN_JAVA_USHORT (buffer, 3);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return obj;
}
2014-06-25 02:11:43 +00:00
R_API int r_bin_java_check_reset_cp_obj(RBinJavaCPTypeObj* cp_obj, ut8 tag) {
bool res = false;
if (tag < R_BIN_JAVA_CP_METAS_SZ) {
if (tag != cp_obj->tag) {
if (cp_obj->tag == R_BIN_JAVA_CP_UTF8) {
free (cp_obj->info.cp_utf8.bytes);
cp_obj->info.cp_utf8.bytes = NULL;
cp_obj->info.cp_utf8.length = 0;
free (cp_obj->name);
cp_obj->name = NULL;
res = true;
}
cp_obj->tag = tag;
cp_obj->metas->type_info = (void *)&R_BIN_JAVA_CP_METAS[tag];
cp_obj->name = strdup (R_BIN_JAVA_CP_METAS[tag].name);
res = true;
} else eprintf ("Invalid tag\n");
} else {
eprintf ("Invalid tag '%d'.\n", tag);
}
return res;
}
R_API ut8 * r_bin_java_cp_get_4bytes(ut8 tag, ut32 *out_sz, const ut8 *buf, const ut64 len) {
ut8 *buffer = malloc (5);
2015-11-24 17:26:10 +00:00
if (!buffer) return NULL;
2014-03-27 03:39:56 +00:00
ut32 val = 0;
if (!buffer || len < 4) {
if (out_sz) *out_sz = 0;
2014-03-27 03:39:56 +00:00
free (buffer);
return NULL;
}
2014-03-29 01:55:43 +00:00
buffer[0] = tag;
2014-03-27 03:39:56 +00:00
val = R_BIN_JAVA_UINT (buf, 0);
memcpy (buffer+1, (const char *) &val, 4);
*out_sz = 5;
return buffer;
}
R_API ut8 * r_bin_java_cp_get_8bytes(ut8 tag, ut32 *out_sz, const ut8 *buf, const ut64 len) {
2015-11-02 16:27:40 +00:00
ut8 *buffer = malloc (10);
2014-03-27 03:39:56 +00:00
ut32 val = 0;
if (len < 8) {
*out_sz = 0;
free (buffer);
return NULL;
}
2014-03-29 01:55:43 +00:00
buffer[0] = tag;
2014-03-27 03:39:56 +00:00
val = r_bin_java_raw_to_long (buf, 0);
memcpy (buffer+1, (const char *) &val, 8);
*out_sz = 9;
return buffer;
}
R_API ut8 * r_bin_java_cp_append_classref_and_name (RBinJavaObj *bin, ut32 *out_sz, const char *classname, const ut32 classname_len) {
ut16 use_name_idx = bin->cp_idx+1;
ut8* bytes = NULL, *name_bytes = NULL;
name_bytes = r_bin_java_cp_get_utf8 (R_BIN_JAVA_CP_UTF8, out_sz, (const ut8 *) classname, classname_len);
if (*out_sz > 0 && name_bytes) {
ut8* idx_addr = (ut8*) &use_name_idx;
bytes = malloc (*out_sz + 3);
memcpy (bytes, name_bytes, *out_sz);
bytes[*out_sz + 0] = R_BIN_JAVA_CP_CLASS;
bytes[*out_sz + 1] = idx_addr[1];
bytes[*out_sz + 2] = idx_addr[0];
*out_sz += 3;
}
free (name_bytes);
return bytes;
}
R_API ut8 * r_bin_java_cp_get_fref_bytes (RBinJavaObj *bin, ut32 *out_sz, ut8 tag, ut16 cn_idx, ut16 fn_idx, ut16 ft_idx) {
ut8 *bytes = NULL, *fnt_bytes = NULL;
RBinJavaCPTypeObj *ref_cp_obj = NULL;
ut16 fnt_idx = 0, cref_idx = 0;
ut32 fnt_len = 0;
ut16 ref_cp_obj_idx = r_bin_java_find_cp_class_ref_from_name_idx (bin, cn_idx);
if (!ref_cp_obj_idx) return NULL;
ref_cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, ref_cp_obj_idx);
if (ref_cp_obj) cref_idx = ref_cp_obj->idx;
ref_cp_obj = r_bin_java_find_cp_name_and_type_info (bin, fn_idx, ft_idx);
if (ref_cp_obj) fnt_idx = ref_cp_obj->idx;
else {
fnt_bytes = r_bin_java_cp_get_name_type (bin, &fnt_len, fn_idx, ft_idx);
fnt_idx = bin->cp_idx+1;
}
if (cref_idx && fnt_idx) {
bytes = r_bin_java_cp_get_fm_ref (bin, out_sz, tag, cref_idx, fnt_idx);
if (fnt_bytes) {
ut8 *tbuf = malloc (fnt_len+*out_sz);
// copy the bytes to the new buffer
memcpy (tbuf, fnt_bytes, fnt_len);
memcpy (tbuf+fnt_len, bytes, *out_sz);
// update the values free old buffer
*out_sz += fnt_len;
free (bytes);
bytes = tbuf;
}
}
2014-04-09 14:51:10 +00:00
free (fnt_bytes);
return bytes;
}
R_API ut8 * r_bin_java_cp_get_classref (RBinJavaObj *bin, ut32 *out_sz, const char *classname, const ut32 classname_len, const ut16 name_idx) {
ut16 use_name_idx = -1;
ut8* bytes = NULL;
if (name_idx == (ut16) -1 && classname && *classname && classname_len > 0) {
// find class_name_idx by class name
RList *results = r_bin_java_find_cp_const_by_val_utf8 (bin, (const ut8 *) classname, classname_len);
if (r_list_length (results) == 1) {
use_name_idx = (ut16) *((ut32 *) r_list_get_n (results, 0));
}
r_list_free (results);
} else if (name_idx != (ut16) -1 && name_idx != 0) {
use_name_idx = name_idx;
}
if (use_name_idx == (ut16) -1 && classname && *classname && classname_len > 0) {
bytes = r_bin_java_cp_append_classref_and_name (bin, out_sz, classname, classname_len);
} else if (use_name_idx != (ut16) -1) {
ut8* idx_addr = (ut8*) &use_name_idx;
bytes = malloc (3);
bytes[0] = R_BIN_JAVA_CP_CLASS;
bytes[1] = idx_addr[1];
bytes[2] = idx_addr[0];
*out_sz += 3;
}
return bytes;
}
R_API ut8 * r_bin_java_cp_get_fm_ref (RBinJavaObj *bin, ut32 *out_sz, ut8 tag, ut16 class_idx, ut16 name_and_type_idx) {
return r_bin_java_cp_get_2_ut16 (bin, out_sz, tag, class_idx, name_and_type_idx);
}
R_API ut8 * r_bin_java_cp_get_2_ut16 (RBinJavaObj *bin, ut32 *out_sz, ut8 tag, ut16 ut16_one, ut16 ut16_two) {
ut8* bytes = malloc (7);
ut8* idx_addr = NULL;
bytes [*out_sz] = tag;
*out_sz += 1;
idx_addr = (ut8*) &ut16_one;
bytes[*out_sz + 1] = idx_addr[1];
bytes[*out_sz + 2] = idx_addr[0];
*out_sz += 3;
idx_addr = (ut8*) &ut16_two;
bytes[*out_sz + 1] = idx_addr[1];
bytes[*out_sz + 2] = idx_addr[0];
*out_sz += 3;
return bytes;
}
R_API ut8 * r_bin_java_cp_get_name_type (RBinJavaObj *bin, ut32 *out_sz, ut16 name_idx, ut16 type_idx) {
return r_bin_java_cp_get_2_ut16 (bin, out_sz, R_BIN_JAVA_CP_NAMEANDTYPE, name_idx, type_idx);
}
R_API ut8 * r_bin_java_cp_get_utf8(ut8 tag, ut32 *out_sz, const ut8 *buf, const ut64 len) {
ut8 *buffer = NULL;
2014-03-27 03:39:56 +00:00
ut16 sz = 0;
ut16 t = (ut16) len;
if (len > 0 && len > (ut16) -1) {
2014-03-27 03:39:56 +00:00
*out_sz = 0;
2014-03-28 17:04:57 +00:00
return NULL;
2014-03-27 03:39:56 +00:00
}
sz = R_BIN_JAVA_USHORT (((ut8 *)(ut16*)&t), 0);
2014-03-28 17:04:57 +00:00
*out_sz = 3 + t; // tag + sz + bytes
buffer = malloc (*out_sz+3);
// XXX - excess bytes are created to ensure null for string operations.
memset (buffer, 0, *out_sz+3);
2014-03-29 01:55:43 +00:00
buffer[0] = tag;
memcpy (buffer+1, (const char *) &sz, 2);
memcpy (buffer+3, buf, *out_sz-3);
return buffer;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_invokedynamic_cp_calc_size(RBinJavaCPTypeObj* obj) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 size = 0;
size += 1;
//obj->info.cp_invoke_dynamic.bootstrap_method_attr_index = R_BIN_JAVA_USHORT (buffer, 1);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
//obj->info.cp_invoke_dynamic.name_and_type_index = R_BIN_JAVA_USHORT (buffer, 3);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
size += 2;
return size;
}
// End new Constant Pool types
// Start free Constant Pool types
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_default_free (void /* RBinJavaCPTypeObj*/ *o) {
RBinJavaCPTypeObj *obj = o;
if(obj) {
free (obj->metas);
free (obj->name);
free (obj->value);
free (obj);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_utf8_info_free (void /* RBinJavaCPTypeObj*/ *o) {
RBinJavaCPTypeObj *obj = o;
if(obj) {
free (obj->name);
free (obj->metas);
free (obj->info.cp_utf8.bytes);
free (obj);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
// Deallocs for type objects
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_obj_free (void /*RBinJavaCPTypeObj*/ *o) {
RBinJavaCPTypeObj* obj = o;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_attr_summary(RBinJavaAttrInfo *attr) {
if (attr == NULL) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *.\n");
return;
}
((RBinJavaAttrMetas *) attr->metas->type_info)->allocs->print_summary (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_source_debug_attr_summary(RBinJavaAttrInfo *attr) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 i = 0;
if (attr == NULL) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
eprintf ("Attempting to print an invalid RBinJavaSourceDebugExtensionAttr *.\n");
return;
}
Eprintf ("Source Debug Extension Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Extension Length: %d\n", attr->length);
Eprintf (" Source Debug Extension value: \n");
for (i = 0; i < attr->length; i++) {
Eprintf ("%c", attr->info.debug_extensions.debug_extension[i]);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
Eprintf ("\n Source Debug Extension End\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_unknown_attr_summary(RBinJavaAttrInfo *attr) {
if (attr == NULL) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *Unknown.\n");
return;
}
Eprintf ("Unknown Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_code_exceptions_attr_summary(RBinJavaExceptionEntry *exc_entry) {
if (exc_entry == NULL) {
eprintf ("Attempting to print an invalid RBinJavaExceptionEntry *.\n");
return;
}
Eprintf (" Exception Table Entry Information\n");
Eprintf (" offset: 0x%08"PFMT64x"\n", exc_entry->file_offset);
Eprintf (" catch_type: %d\n", exc_entry->catch_type);
Eprintf (" start_pc: 0x%04x\n", exc_entry->start_pc);
Eprintf (" end_pc: 0x%04x\n", exc_entry->end_pc);
Eprintf (" handler_pc: 0x%04x\n", exc_entry->handler_pc);
}
// End free Constant Pool types
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_code_attr_summary(RBinJavaAttrInfo *attr) {
RListIter *iter = NULL, *iter_tmp = NULL;
RBinJavaExceptionEntry* exc_entry = NULL;
RBinJavaAttrInfo *_attr = NULL;
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *Code.\n");
return;
}
Eprintf ("Code Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d, Attribute Count: %d\n", attr->length, attr->info.code_attr.attributes_count);
Eprintf (" Max Stack: %d\n", attr->info.code_attr.max_stack);
Eprintf (" Max Locals: %d\n", attr->info.code_attr.max_locals);
Eprintf (" Code Length: %d\n", attr->info.code_attr.code_length);
Eprintf (" Code At Offset: 0x%08"PFMT64x"\n", (ut64)attr->info.code_attr.code_offset);
Eprintf ("Code Attribute Exception Table Information:\n");
Eprintf (" Exception Table Length: %d\n",attr->info.code_attr.exception_table_length);
if (attr->info.code_attr.exception_table) {
// Delete the attr entries
r_list_foreach_safe (attr->info.code_attr.exception_table, iter, iter_tmp, exc_entry) {
r_bin_java_print_code_exceptions_attr_summary (exc_entry);
}
}
Eprintf (" Implicit Method Stack Frame:\n");
r_bin_java_print_stack_map_frame_summary (attr->info.code_attr.implicit_frame);
Eprintf ("Code Attribute Attributes Information:\n");
if (attr->info.code_attr.attributes && attr->info.code_attr.attributes_count > 0) {
Eprintf (" Code Attribute Attributes Count: %d\n",attr->info.code_attr.attributes_count);
r_list_foreach_safe (attr->info.code_attr.attributes, iter, iter_tmp, _attr) {
r_bin_java_print_attr_summary (_attr);
}
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_constant_value_attr_summary(RBinJavaAttrInfo *attr) {
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *ConstantValue.\n");
return;
}
Eprintf ("Constant Value Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
Eprintf (" ConstantValue Index: %d\n", attr->info.constant_value_attr.constantvalue_idx);
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_deprecated_attr_summary(RBinJavaAttrInfo *attr) {
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *Deperecated.\n");
return;
}
Eprintf ("Deperecated Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_enclosing_methods_attr_summary(RBinJavaAttrInfo *attr) {
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *Deperecated.\n");
return;
}
Eprintf ("Enclosing Method Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
Eprintf (" Class Info Index : 0x%02x\n", attr->info.enclosing_method_attr.class_idx);
Eprintf (" Method Name and Type Index : 0x%02x\n", attr->info.enclosing_method_attr.method_idx);
Eprintf (" Class Name : %s\n", attr->info.enclosing_method_attr.class_name);
Eprintf (" Method Name and Desc : %s %s\n", attr->info.enclosing_method_attr.method_name, attr->info.enclosing_method_attr.method_descriptor);
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_exceptions_attr_summary(RBinJavaAttrInfo *attr) {
ut32 i = 0;
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *Exceptions.\n");
return;
}
Eprintf ("Exceptions Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
for (i = 0; i < attr->info.exceptions_attr.number_of_exceptions; i++) {
Eprintf (" Exceptions Attribute Index[%d]: %d\n", i, attr->info.exceptions_attr.exception_idx_table[i]);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_classes_attr_summary(RBinJavaClassesAttribute *icattr) {
if (!icattr) {
eprintf ("Attempting to print an invalid RBinJavaClassesAttribute* (InnerClasses element).\n");
return;
}
eprintf (" Inner Classes Class Attribute Offset: 0x%08"PFMT64x"\n", icattr->file_offset);
eprintf (" Inner Classes Class Attribute Class Name (%d): %s\n", icattr->inner_name_idx, icattr->name);
eprintf (" Inner Classes Class Attribute Class inner_class_info_idx: %d\n", icattr->inner_class_info_idx);
eprintf (" Inner Classes Class Attribute Class inner_class_access_flags: 0x%02x %s\n", icattr->inner_class_access_flags, icattr->flags_str);
eprintf (" Inner Classes Class Attribute Class outer_class_info_idx: %d\n", icattr->outer_class_info_idx);
eprintf (" Inner Classes Class Field Information:\n");
r_bin_java_print_field_summary (icattr->clint_field);
eprintf (" Inner Classes Class Field Information:\n");
r_bin_java_print_field_summary (icattr->clint_field);
eprintf (" Inner Classes Class Attr Info Information:\n");
r_bin_java_print_attr_summary (icattr->clint_attr);
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_inner_classes_attr_summary(RBinJavaAttrInfo *attr) {
RBinJavaClassesAttribute *icattr;
RListIter *iter, *iter_tmp;
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *InnerClasses.\n");
return;
}
Eprintf ("Inner Classes Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
r_list_foreach_safe (attr->info.inner_classes_attr.classes, iter, iter_tmp, icattr) {
r_bin_java_print_classes_attr_summary (icattr);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_line_number_attr_summary(RBinJavaLineNumberAttribute *lnattr) {
if (!lnattr) {
eprintf ("Attempting to print an invalid RBinJavaLineNumberAttribute *.\n");
return;
}
Eprintf (" Line Number Attribute Offset: 0x%08"PFMT64x"\n", lnattr->file_offset);
Eprintf (" Line Number Attribute StartPC: %d\n", lnattr->start_pc);
Eprintf (" Line Number Attribute LineNumber: %d\n", lnattr->line_number);
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_line_number_table_attr_summary(RBinJavaAttrInfo *attr) {
RBinJavaLineNumberAttribute *lnattr;
RListIter *iter, *iter_tmp;
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *LineNumberTable.\n");
return;
}
Eprintf ("Line Number Table Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
r_list_foreach_safe (attr->info.line_number_table_attr.line_number_table, iter, iter_tmp, lnattr) {
r_bin_java_print_line_number_attr_summary (lnattr);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_local_variable_attr_summary(RBinJavaLocalVariableAttribute *lvattr) {
if (!lvattr) {
eprintf ("Attempting to print an invalid RBinJavaLocalVariableAttribute *.\n");
return;
}
Eprintf (" Local Variable Attribute offset: 0x%08"PFMT64x"\n", lvattr->file_offset);
Eprintf (" Local Variable Attribute start_pc: %d\n", lvattr->start_pc);
Eprintf (" Local Variable Attribute Length: %d\n", lvattr->length);
Eprintf (" Local Variable Attribute name_idx: %d\n", lvattr->name_idx);
Eprintf (" Local Variable Attribute name: %s\n", lvattr->name);
Eprintf (" Local Variable Attribute descriptor_idx: %d\n", lvattr->descriptor_idx);
Eprintf (" Local Variable Attribute descriptor: %s\n", lvattr->descriptor);
Eprintf (" Local Variable Attribute index: %d\n", lvattr->index);
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_local_variable_table_attr_summary(RBinJavaAttrInfo *attr) {
RBinJavaLocalVariableAttribute *lvattr;
RListIter *iter, *iter_tmp;
if (attr == NULL) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *LocalVariableTable.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf ("Local Variable Table Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
r_list_foreach_safe (attr->info.local_variable_table_attr.local_variable_table, iter, iter_tmp, lvattr) {
r_bin_java_print_local_variable_attr_summary (lvattr);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_local_variable_type_attr_summary(RBinJavaLocalVariableTypeAttribute *lvattr) {
if (!lvattr) {
eprintf ("Attempting to print an invalid RBinJavaLocalVariableTypeAttribute *.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf (" Local Variable Type Attribute offset: 0x%08"PFMT64x"\n", lvattr->file_offset);
eprintf (" Local Variable Type Attribute start_pc: %d\n", lvattr->start_pc);
eprintf (" Local Variable Type Attribute Length: %d\n", lvattr->length);
eprintf (" Local Variable Type Attribute name_idx: %d\n", lvattr->name_idx);
eprintf (" Local Variable Type Attribute name: %s\n", lvattr->name);
eprintf (" Local Variable Type Attribute signature_idx: %d\n", lvattr->signature_idx);
eprintf (" Local Variable Type Attribute signature: %s\n", lvattr->signature);
eprintf (" Local Variable Type Attribute index: %d\n", lvattr->index);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_local_variable_type_table_attr_summary(RBinJavaAttrInfo *attr) {
RBinJavaLocalVariableTypeAttribute *lvtattr;
RListIter *iter, *iter_tmp;
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *LocalVariableTable.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf ("Local Variable Type Table Attribute Information:\n");
eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
eprintf (" Attribute Length: %d\n", attr->length);
r_list_foreach_safe (attr->info.local_variable_type_table_attr.local_variable_table, iter, iter_tmp, lvtattr) {
r_bin_java_print_local_variable_type_attr_summary (lvtattr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_signature_attr_summary(RBinJavaAttrInfo *attr) {
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *SignatureAttr.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf ("Signature Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
Eprintf (" Signature UTF8 Index: %d\n", attr->info.signature_attr.signature_idx);
Eprintf (" Signature string: %s\n", attr->info.signature_attr.signature);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_source_code_file_attr_summary(RBinJavaAttrInfo *attr) {
if (!attr) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *SourceFile.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf ("Source File Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
Eprintf (" Source File Index: %d\n", attr->info.source_file_attr.sourcefile_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_synthetic_attr_summary(RBinJavaAttrInfo *attr) {
if (attr == NULL) {
eprintf ("Attempting to print an invalid RBinJavaAttrInfo *Synthetic.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf ("Synthetic Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
Eprintf (" Attribute Index: %d\n", attr->info.source_file_attr.sourcefile_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_stack_map_table_attr_summary(RBinJavaAttrInfo *attr) {
RListIter *iter, *iter_tmp;
RList *ptrList;
RBinJavaStackMapFrame *frame;
if(attr == NULL) {
eprintf ("Attempting to print an invalid RBinJavaStackMapTableAttr* .\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf ("StackMapTable Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
Eprintf (" StackMapTable Method Code Size: 0x%08x\n", attr->info.stack_map_table_attr.code_size);
Eprintf (" StackMapTable Frame Entries: 0x%08x\n", attr->info.stack_map_table_attr.number_of_entries);
Eprintf (" StackMapTable Frames:\n");
ptrList = attr->info.stack_map_table_attr.stack_map_frame_entries;
if (ptrList) {
r_list_foreach_safe (ptrList, iter, iter_tmp, frame) {
r_bin_java_print_stack_map_frame_summary (frame);
}
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_stack_map_frame_summary(RBinJavaStackMapFrame *obj) {
RListIter *iter, *iter_tmp;
RList *ptrList;
RBinJavaVerificationObj *ver_obj;
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaStackMapFrame* .\n");
return;
}
Eprintf ("Stack Map Frame Information\n");
Eprintf (" Tag Value = 0x%02x Name: %s\n", obj->tag, ((RBinJavaStackMapFrameMetas *) obj->metas->type_info)->name);
Eprintf (" Offset: 0x%08"PFMT64x"\n", obj->file_offset);
Eprintf (" Local Variable Count = 0x%04x\n", obj->number_of_locals);
Eprintf (" Stack Items Count = 0x%04x\n", obj->number_of_stack_items);
Eprintf (" Local Variables:\n");
ptrList = obj->local_items;
r_list_foreach_safe (ptrList, iter, iter_tmp, ver_obj) {
r_bin_java_print_verification_info_summary (ver_obj);
}
Eprintf (" Stack Items:\n");
ptrList = obj->stack_items;
r_list_foreach_safe (ptrList, iter, iter_tmp, ver_obj) {
r_bin_java_print_verification_info_summary (ver_obj);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_verification_info_summary(RBinJavaVerificationObj *obj) {
ut8 tag_value = R_BIN_JAVA_STACKMAP_UNKNOWN;
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaVerificationObj* .\n");
return;
}
if (obj->tag < R_BIN_JAVA_STACKMAP_UNKNOWN)
tag_value = obj->tag;
Eprintf ("Verification Information\n");
Eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
Eprintf (" Tag Value = 0x%02x\n", obj->tag);
Eprintf (" Name = %s\n", R_BIN_JAVA_VERIFICATION_METAS[tag_value].name);
if (obj->tag == R_BIN_JAVA_STACKMAP_OBJECT) {
Eprintf (" Object Constant Pool Index = 0x%x\n", obj->info.obj_val_cp_idx);
} else if (obj->tag == R_BIN_JAVA_STACKMAP_UNINIT) {
Eprintf (" Uninitialized Object offset in code = 0x%x\n", obj->info.uninit_offset);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_field_summary(RBinJavaField *field) {
RBinJavaAttrInfo *attr;
RListIter *iter, *iter_tmp;
if (field) {
if (field->type == R_BIN_JAVA_FIELD_TYPE_METHOD) {
r_bin_java_print_method_summary (field);
} else {
#if 0
r_bin_java_print_interface_summary(field);
return;
}*/
#endif
Eprintf ("Field Summary Information:\n");
Eprintf (" File Offset: 0x%08"PFMT64x"\n", field->file_offset);
Eprintf (" Name Index: %d (%s)\n", field->name_idx, field->name);
Eprintf (" Descriptor Index: %d (%s)\n", field->descriptor_idx, field->descriptor);
Eprintf (" Access Flags: 0x%02x (%s)\n", field->flags, field->flags_str);
Eprintf (" Field Attributes Count: %d\n", field->attr_count);
Eprintf (" Field Attributes:\n");
r_list_foreach_safe (field->attributes, iter, iter_tmp, attr) {
r_bin_java_print_attr_summary (attr);
}
}
} else {
eprintf ("Attempting to print an invalid RBinJavaField* Field.\n");
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_method_summary(RBinJavaField *field) {
RBinJavaAttrInfo *attr;
RListIter *iter, *iter_tmp;
if (field == NULL) {
eprintf ("Attempting to print an invalid RBinJavaField* Method.\n");
return;
}
Eprintf ("Method Summary Information:\n");
Eprintf (" File Offset: 0x%08"PFMT64x"\n", field->file_offset);
Eprintf (" Name Index: %d (%s)\n", field->name_idx, field->name);
Eprintf (" Descriptor Index: %d (%s)\n", field->descriptor_idx, field->descriptor);
Eprintf (" Access Flags: 0x%02x (%s)\n", field->flags, field->flags_str);
Eprintf (" Method Attributes Count: %d\n", field->attr_count);
Eprintf (" Method Attributes:\n");
r_list_foreach_safe (field->attributes, iter, iter_tmp, attr) {
r_bin_java_print_attr_summary (attr);
}
}
/*
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_interface_summary(ut16 idx) {//RBinJavaField *field) {
RBinJavaAttrInfo *attr;
RBinJavaCPTypeObj *class_info;
RListIter *iter, *iter_tmp;
if (field == NULL) {
eprintf ("Attempting to print an invalid RBinJavaField* Interface.\n");
return;
}
eprintf ("Interface Summary Information:\n");
eprintf (" File offset: 0x%08"PFMT64x"", field->file_offset);
eprintf (" Access Flags: %d\n", field->flags);
eprintf (" Name Index: %d (%s)\n", field->name_idx, field->name);
eprintf (" Descriptor Index: %d (%s)\n", field->descriptor_idx, field->descriptor);
eprintf (" Interface Attributes Count: %d\n", field->attr_count);
eprintf (" Interface Attributes:\n");
r_list_foreach_safe (field->attributes, iter, iter_tmp, attr) {
r_bin_java_print_attr_summary(attr);
}
}
*/
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_interfacemethodref_cp_summary(RBinJavaCPTypeObj* obj) {
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* InterfaceMethodRef.\n");
return;
}
eprintf ("InterfaceMethodRef ConstantPool Type (%d) ", obj->metas->ord);
eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
eprintf (" Class Index = %d\n", obj->info.cp_interface.class_idx);
eprintf (" Name and type Index = %d\n", obj->info.cp_interface.name_and_type_idx);
}
R_API char * r_bin_java_print_interfacemethodref_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_interface.class_idx, obj->info.cp_interface.name_and_type_idx);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_interface.class_idx, obj->info.cp_interface.name_and_type_idx);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_methodhandle_cp_summary(RBinJavaCPTypeObj* obj) {
ut8 ref_kind;
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* RBinJavaCPTypeMethodHandle.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
ref_kind = obj->info.cp_method_handle.reference_kind;
eprintf ("MethodHandle ConstantPool Type (%d) ", obj->metas->ord);
eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
eprintf (" Reference Kind = (0x%02x) %s\n", ref_kind, R_BIN_JAVA_REF_METAS[ref_kind].name);
eprintf (" Reference Index = %d\n", obj->info.cp_method_handle.reference_index);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_print_methodhandle_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
ut8 ref_kind = obj->info.cp_method_handle.reference_kind;
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%s.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
R_BIN_JAVA_REF_METAS[ref_kind].name, obj->info.cp_method_handle.reference_index);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%s.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
R_BIN_JAVA_REF_METAS[ref_kind].name, obj->info.cp_method_handle.reference_index);
}
}
}
return value;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_methodtype_cp_summary(RBinJavaCPTypeObj* obj) {
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* RBinJavaCPTypeMethodType.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf ("MethodType ConstantPool Type (%d) ", obj->metas->ord);
Eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
Eprintf (" Descriptor Index = 0x%02x\n", obj->info.cp_method_type.descriptor_index);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_API char * r_bin_java_print_methodtype_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_method_type.descriptor_index);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_method_type.descriptor_index);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_invokedynamic_cp_summary(RBinJavaCPTypeObj* obj) {
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* RBinJavaCPTypeInvokeDynamic.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf ("InvokeDynamic ConstantPool Type (%d) ", obj->metas->ord);
eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
eprintf (" Bootstrap Method Attr Index = (0x%02x)\n", obj->info.cp_invoke_dynamic.bootstrap_method_attr_index);
eprintf (" Bootstrap Name and Type Index = (0x%02x)\n", obj->info.cp_invoke_dynamic.name_and_type_index);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_print_invokedynamic_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_invoke_dynamic.bootstrap_method_attr_index,
obj->info.cp_invoke_dynamic.name_and_type_index);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_invoke_dynamic.bootstrap_method_attr_index,
obj->info.cp_invoke_dynamic.name_and_type_index);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_methodref_cp_summary(RBinJavaCPTypeObj* obj) {
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* MethodRef.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf ("MethodRef ConstantPool Type (%d) ", obj->metas->ord);
eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
eprintf (" Class Index = %d\n", obj->info.cp_method.class_idx);
eprintf (" Name and type Index = %d\n", obj->info.cp_method.name_and_type_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_print_methodref_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_method.class_idx,
obj->info.cp_method.name_and_type_idx);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_method.class_idx,
obj->info.cp_method.name_and_type_idx);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_fieldref_cp_summary(RBinJavaCPTypeObj* obj) {
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* FieldRef.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf ("FieldRef ConstantPool Type (%d) ", obj->metas->ord);
eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
eprintf (" Class Index = %d\n", obj->info.cp_field.class_idx);
eprintf (" Name and type Index = %d\n", obj->info.cp_field.name_and_type_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_print_fieldref_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_field.class_idx,
obj->info.cp_field.name_and_type_idx);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_field.class_idx,
obj->info.cp_field.name_and_type_idx);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_classref_cp_summary(RBinJavaCPTypeObj* obj) {
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* ClassRef.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf ("ClassRef ConstantPool Type (%d) ", obj->metas->ord);
eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
eprintf (" Name Index = %d\n", obj->info.cp_class.name_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_print_classref_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_class.name_idx);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_class.name_idx);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_string_cp_summary(RBinJavaCPTypeObj* obj) {
if (!obj) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* String.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf ("String ConstantPool Type (%d) ", obj->metas->ord);
Eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
Eprintf (" String Index = %d\n", obj->info.cp_string.string_idx);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_print_string_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_string.string_idx);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d",
obj->metas->ord, obj->file_offset,
((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_string.string_idx);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_integer_cp_summary(RBinJavaCPTypeObj* obj) {
ut8 *b = NULL;
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* Integer.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
b = obj->info.cp_integer.bytes.raw;
eprintf ("Integer ConstantPool Type (%d) ", obj->metas->ord);
eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
eprintf (" bytes = %02x %02x %02x %02x\n", b[0], b[1], b[2], b[3]);
eprintf (" integer = %d\n", R_BIN_JAVA_UINT (obj->info.cp_integer.bytes.raw, 0));
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_API char * r_bin_java_print_integer_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.0x%08x",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
R_BIN_JAVA_UINT (obj->info.cp_integer.bytes.raw, 0));
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.0x%08x",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
R_BIN_JAVA_UINT (obj->info.cp_integer.bytes.raw, 0));
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_float_cp_summary(RBinJavaCPTypeObj* obj) {
ut8 *b = NULL;
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* Double.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
b = obj->info.cp_float.bytes.raw;
Eprintf ("Float ConstantPool Type (%d) ", obj->metas->ord);
Eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
Eprintf (" Bytes = %02x %02x %02x %02x\n", b[0], b[1], b[2], b[3]);
Eprintf (" Float = %f\n", R_BIN_JAVA_FLOAT(obj->info.cp_float.bytes.raw, 0));
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_print_float_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%f",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
R_BIN_JAVA_FLOAT(obj->info.cp_float.bytes.raw, 0));
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%f",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
R_BIN_JAVA_FLOAT(obj->info.cp_float.bytes.raw, 0));
}
}
}
return value;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_long_cp_summary(RBinJavaCPTypeObj* obj) {
ut8 *b = NULL;
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* Long.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
b = obj->info.cp_long.bytes.raw;
Eprintf ("Long ConstantPool Type (%d) ", obj->metas->ord);
Eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
Eprintf (" High-Bytes = %02x %02x %02x %02x\n", b[0], b[1], b[2], b[3]);
Eprintf (" Low-Bytes = %02x %02x %02x %02x\n", b[4], b[5], b[6], b[7]);
Eprintf (" Long = %08"PFMT64x"\n", r_bin_java_raw_to_long(obj->info.cp_long.bytes.raw, 0));
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_API char * r_bin_java_print_long_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.0x%08"PFMT64x"",
obj->metas->ord,
obj->file_offset,
((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
r_bin_java_raw_to_long(obj->info.cp_long.bytes.raw, 0));
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.0x%08"PFMT64x"",
obj->metas->ord,
obj->file_offset,
((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
r_bin_java_raw_to_long(obj->info.cp_long.bytes.raw, 0));
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_double_cp_summary(RBinJavaCPTypeObj* obj) {
ut8 *b = NULL;
if (!obj) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* Double.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
b = obj->info.cp_double.bytes.raw;
Eprintf ("Double ConstantPool Type (%d) ", obj->metas->ord);
Eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
Eprintf (" High-Bytes = %02x %02x %02x %02x\n", b[0], b[1], b[2], b[3]);
Eprintf (" Low-Bytes = %02x %02x %02x %02x\n", b[4], b[5], b[6], b[7]);
Eprintf (" Double = %f\n", r_bin_java_raw_to_double (obj->info.cp_double.bytes.raw, 0));
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_API char * r_bin_java_print_double_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%f",
obj->metas->ord,
obj->file_offset,
((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
r_bin_java_raw_to_double (obj->info.cp_double.bytes.raw, 0));
if (consumed >= size-1) {
free (value);
size += size >> 1;
value = malloc (size);
if (value) {
memset (value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%f",
obj->metas->ord,
obj->file_offset,
((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
r_bin_java_raw_to_double (obj->info.cp_double.bytes.raw, 0));
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_name_and_type_cp_summary(RBinJavaCPTypeObj* obj) {
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* Name_And_Type.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf ("Name_And_Type ConstantPool Type (%d) ", obj->metas->ord);
Eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
Eprintf (" name_idx = (%d)\n", obj->info.cp_name_and_type.name_idx);
Eprintf (" descriptor_idx = (%d)\n", obj->info.cp_name_and_type.descriptor_idx);
}
R_API char * r_bin_java_print_name_and_type_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * value = malloc(size);
if (value) {
memset (value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_name_and_type.name_idx,
obj->info.cp_name_and_type.descriptor_idx);
if (consumed >= size-1) {
free (value);
size += size >> 1;
value = malloc (size);
if (value) {
memset (value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%d",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_name_and_type.name_idx,
obj->info.cp_name_and_type.descriptor_idx);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_utf8_cp_summary(RBinJavaCPTypeObj* obj) {
if(obj == NULL) {
eprintf ("Attempting to print an invalid RBinJavaCPTypeObj* Utf8.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
char *str = convert_string ((const char *) obj->info.cp_utf8.bytes, obj->info.cp_utf8.length);
eprintf ("UTF8 ConstantPool Type (%d) ", obj->metas->ord);
eprintf (" Offset: 0x%08"PFMT64x"", obj->file_offset);
eprintf (" length = %d\n", obj->info.cp_utf8.length);
eprintf (" utf8 = %s\n", str);
free (str);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_print_utf8_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char * utf8_str = r_hex_bin2strdup(obj->info.cp_utf8.bytes, obj->info.cp_utf8.length);
char * value = malloc(size + strlen(utf8_str));
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%s",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_utf8.length,
utf8_str);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size + strlen(utf8_str));
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s.%d.%s",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name,
obj->info.cp_utf8.length,
utf8_str);
}
}
}
free(utf8_str);
return value;
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_null_cp_summary(RBinJavaCPTypeObj* obj) {
eprintf ("Unknown ConstantPool Type Tag: 0x%04x .\n", obj->tag);
}
R_API char * r_bin_java_print_null_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255, consumed = 0;
char *value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name);
if (consumed >= size-1) {
free(value);
size += size >> 1;
value = malloc(size);
if (value) {
memset(value, 0, size);
consumed = snprintf(value, size, "%d.0x%04"PFMT64x".%s",
obj->metas->ord, obj->file_offset,
((RBinJavaCPTypeMetas *) obj->metas->type_info)->name);
}
}
}
return value;
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_unknown_cp_summary(RBinJavaCPTypeObj* obj) {
eprintf ("NULL ConstantPool Type.\n");
}
R_API char * r_bin_java_print_unknown_cp_stringify(RBinJavaCPTypeObj* obj) {
ut32 size = 255;
char *value = malloc(size);
if (value) {
memset(value, 0, size);
snprintf(value, size, "%d.0x%04"PFMT64x".%s",
obj->metas->ord, obj->file_offset + obj->loadaddr, ((RBinJavaCPTypeMetas *) obj->metas->type_info)->name);
}
return value;
}
R_API RBinJavaElementValuePair* r_bin_java_element_pair_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
RBinJavaElementValuePair *ev_pair = NULL;
ut64 offset = 0;
if (!buffer) {
return NULL;
}
ev_pair = R_NEW0 (RBinJavaElementValuePair);
if (!ev_pair) {
// TODO eprintf ev_pair failed to allocate
return NULL;
}
// TODO: What is the signifigance of ev_pair element
ev_pair->element_name_idx = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
ev_pair->file_offset = buf_offset;
ev_pair->name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, ev_pair->element_name_idx);
if (ev_pair->name == NULL) {
// TODO: eprintf unable to find the name for the given index
eprintf ("ElementValue Name is invalid.\n");
ev_pair->name = strdup ("UNKNOWN");
}
ev_pair->value = r_bin_java_element_value_new (buffer+offset, sz-offset, buf_offset+offset);
offset += ev_pair->value->size;
ev_pair->size = offset;
return ev_pair;
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_element_pair_summary(RBinJavaElementValuePair *ev_pair) {
if (!ev_pair) {
eprintf ("Attempting to print an invalid RBinJavaElementValuePair *pair.\n");
return;
}
Eprintf ("Element Value Pair information:\n");
Eprintf (" EV Pair File Offset: 0x%08"PFMT64x"\n", ev_pair->file_offset);
Eprintf (" EV Pair Element Name index: 0x%02x\n", ev_pair->element_name_idx);
Eprintf (" EV Pair Element Name: %s\n", ev_pair->name);
Eprintf (" EV Pair Element Value:\n");
r_bin_java_print_element_value_summary (ev_pair->value);
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_element_value_summary(RBinJavaElementValue *element_value) {
RBinJavaCPTypeObj *obj;
RBinJavaElementValue *ev_element = NULL;
RListIter *iter = NULL, *iter_tmp = NULL;
char* name;
if (element_value == NULL) {
eprintf ("Attempting to print an invalid RBinJavaElementValuePair *pair.\n");
return;
}
name = ((RBinJavaElementValueMetas *)element_value->metas->type_info)->name;
eprintf ("Element Value information:\n");
eprintf (" EV Pair File Offset: 0x%08"PFMT64x"\n", element_value->file_offset);
eprintf (" EV Value Type (%d): %s\n", element_value->tag, name);
switch(element_value->tag) {
case R_BIN_JAVA_EV_TAG_BYTE:
case R_BIN_JAVA_EV_TAG_CHAR:
case R_BIN_JAVA_EV_TAG_DOUBLE:
case R_BIN_JAVA_EV_TAG_FLOAT:
case R_BIN_JAVA_EV_TAG_INT:
case R_BIN_JAVA_EV_TAG_LONG:
case R_BIN_JAVA_EV_TAG_SHORT:
case R_BIN_JAVA_EV_TAG_BOOLEAN:
case R_BIN_JAVA_EV_TAG_STRING:
eprintf (" EV Value Constant Value index: 0x%02x\n", element_value->value.const_value.const_value_idx);
eprintf (" EV Value Constant Value Information:\n");
obj = element_value->value.const_value.const_value_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
break;
case R_BIN_JAVA_EV_TAG_ENUM:
eprintf (" EV Value Enum Constant Value Const Name Index: 0x%02x\n", element_value->value.enum_const_value.const_name_idx);
eprintf (" EV Value Enum Constant Value Type Name Index: 0x%02x\n", element_value->value.enum_const_value.type_name_idx);
eprintf (" EV Value Enum Constant Value Const CP Information:\n");
obj = element_value->value.enum_const_value.const_name_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
eprintf (" EV Value Enum Constant Value Type CP Information:\n");
obj = element_value->value.enum_const_value.type_name_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
break;
case R_BIN_JAVA_EV_TAG_CLASS:
eprintf (" EV Value Class Info Index: 0x%02x\n", element_value->value.class_value.class_info_idx);
eprintf (" EV Value Class Info CP Information:\n");
obj = element_value->value.class_value.class_info_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
break;
case R_BIN_JAVA_EV_TAG_ARRAY:
eprintf (" EV Value Array Value Number of Values: 0x%04x\n", element_value->value.array_value.num_values);
eprintf (" EV Value Array Values\n");
r_list_foreach_safe (element_value->value.array_value.values, iter, iter_tmp, ev_element) {
r_bin_java_print_element_value_summary (ev_element);
}
break;
case R_BIN_JAVA_EV_TAG_ANNOTATION:
eprintf (" EV Annotation Information:\n");
r_bin_java_print_annotation_summary (&element_value->value.annotation_value);
break;
default:
// eprintf unable to handle tag
break;
}
}
R_API void r_bin_java_element_pair_free (void /*RBinJavaElementValuePair*/ *e) {
RBinJavaElementValuePair *ev_pair = e;
if(ev_pair) {
free (ev_pair->name);
r_bin_java_element_value_free (ev_pair->value);
free (ev_pair);
}
ev_pair = NULL;
}
R_API void r_bin_java_element_value_free (void /*RBinJavaElementValue*/* e) {
RBinJavaElementValue* element_value = e;
RListIter *iter = NULL, *iter_tmp = NULL;
RBinJavaCPTypeObj *obj = NULL;
RBinJavaElementValue *ev_element = NULL;
if(element_value) {
free (element_value->metas);
element_value->metas = NULL;
switch (element_value->tag) {
case R_BIN_JAVA_EV_TAG_BYTE:
case R_BIN_JAVA_EV_TAG_CHAR:
case R_BIN_JAVA_EV_TAG_DOUBLE:
case R_BIN_JAVA_EV_TAG_FLOAT:
case R_BIN_JAVA_EV_TAG_INT:
case R_BIN_JAVA_EV_TAG_LONG:
case R_BIN_JAVA_EV_TAG_SHORT:
case R_BIN_JAVA_EV_TAG_BOOLEAN:
case R_BIN_JAVA_EV_TAG_STRING:
//Delete the CP Type Object
obj = element_value->value.const_value.const_value_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
break;
case R_BIN_JAVA_EV_TAG_ENUM:
//Delete the CP Type Objects
obj = element_value->value.enum_const_value.const_name_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
obj = element_value->value.enum_const_value.type_name_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
break;
case R_BIN_JAVA_EV_TAG_CLASS:
//Delete the CP Type Object
obj = element_value->value.class_value.class_info_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
break;
case R_BIN_JAVA_EV_TAG_ARRAY:
//Delete the Element Value array List
r_list_foreach_safe (element_value->value.array_value.values, iter, iter_tmp, ev_element) {
if (ev_element) {
r_bin_java_element_value_free (ev_element);
} else {
// TODO eprintf ev_pairs value was NULL
}
//r_list_delete (element_value->value.array_value.values, iter);
ev_element = NULL;
}
r_list_free (element_value->value.array_value.values);
break;
case R_BIN_JAVA_EV_TAG_ANNOTATION:
//Delete the Annotations List
r_list_free (element_value->value.annotation_value.element_value_pairs);
break;
default:
// eprintf unable to free the tag
break;
}
free (element_value);
}
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_annotation_default_attr_calc_size(RBinJavaAttrInfo *attr) {
ut64 size = 0;
if (attr) {
//attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
size += 6;
//attr->info.annotation_default_attr.default_value = r_bin_java_element_value_new (buffer+offset, sz-offset, buf_offset+offset);
size += r_bin_java_element_value_calc_size(attr->info.annotation_default_attr.default_value);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_annotation_default_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
ut64 offset = 0;
RBinJavaAttrInfo* attr = NULL;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
offset += 6;
if (attr) {
attr->type = R_BIN_JAVA_ATTR_TYPE_ANNOTATION_DEFAULT_ATTR;
attr->info.annotation_default_attr.default_value = r_bin_java_element_value_new (buffer+offset, sz-offset, buf_offset+offset);
if (attr->info.annotation_default_attr.default_value) {
offset += attr->info.annotation_default_attr.default_value->size;
}
}
r_bin_java_print_annotation_default_attr_summary (attr);
return attr;
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_annotation_default_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo *attr = a;
RBinJavaElementValue* element_value = NULL, *ev_element = NULL;
RBinJavaCPTypeObj *obj = NULL;
RListIter *iter = NULL, *iter_tmp = NULL;
if (attr == NULL || attr->type != R_BIN_JAVA_ATTR_TYPE_ANNOTATION_DEFAULT_ATTR) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
element_value = (attr->info.annotation_default_attr.default_value);
switch(element_value->tag) {
case R_BIN_JAVA_EV_TAG_BYTE:
case R_BIN_JAVA_EV_TAG_CHAR:
case R_BIN_JAVA_EV_TAG_DOUBLE:
case R_BIN_JAVA_EV_TAG_FLOAT:
case R_BIN_JAVA_EV_TAG_INT:
case R_BIN_JAVA_EV_TAG_LONG:
case R_BIN_JAVA_EV_TAG_SHORT:
case R_BIN_JAVA_EV_TAG_BOOLEAN:
case R_BIN_JAVA_EV_TAG_STRING:
//Delete the CP Type Object
obj = element_value->value.const_value.const_value_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
break;
case R_BIN_JAVA_EV_TAG_ENUM:
//Delete the CP Type Objects
obj = element_value->value.enum_const_value.const_name_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
obj = element_value->value.enum_const_value.type_name_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
break;
case R_BIN_JAVA_EV_TAG_CLASS:
//Delete the CP Type Object
obj = element_value->value.class_value.class_info_cp_obj;
((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
break;
case R_BIN_JAVA_EV_TAG_ARRAY:
//Delete the Element Value array List
r_list_foreach_safe (element_value->value.array_value.values, iter, iter_tmp, ev_element) {
r_bin_java_element_value_free (ev_element);
//r_list_delete (element_value->value.array_value.values, iter);
ev_element = NULL;
}
r_list_free (element_value->value.array_value.values);
break;
case R_BIN_JAVA_EV_TAG_ANNOTATION:
//Delete the Annotations List
r_list_free (element_value->value.annotation_value.element_value_pairs);
break;
default:
// eprintf unable to free the tag
break;
}
if (attr) {
free (attr->name);
free (attr->metas);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
R_API RBinJavaAnnotation* r_bin_java_annotation_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
ut32 i = 0;
RBinJavaAnnotation *annotation = NULL;
RBinJavaElementValuePair *ev_pairs = NULL;
ut64 offset = 0;
annotation = R_NEW0 (RBinJavaAnnotation);
// (ut16) read and set annotation_value.type_idx;
annotation->type_idx = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
// (ut16) read and set annotation_value.num_element_value_pairs;
annotation->num_element_value_pairs = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
annotation->element_value_pairs = r_list_newf (r_bin_java_element_pair_free);
// read annotation_value.num_element_value_pairs, and append to annotation_value.element_value_pairs
for (i = 0; i < annotation->num_element_value_pairs; i++) {
ev_pairs = r_bin_java_element_pair_new (buffer+offset, sz-offset, buf_offset+offset);
if (ev_pairs) {
offset += ev_pairs->size;
r_list_append (annotation->element_value_pairs, (void *) ev_pairs);
}
}
annotation->size = offset;
return annotation;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_annotation_calc_size(RBinJavaAnnotation* annotation) {
ut64 sz = 0;
RListIter *iter, *iter_tmp;
RBinJavaElementValuePair *ev_pairs = NULL;
if (!annotation) {
// TODO eprintf allocation fail
return sz;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
//annotation->type_idx = R_BIN_JAVA_USHORT (buffer, offset);
sz += 2;
//annotation->num_element_value_pairs = R_BIN_JAVA_USHORT (buffer, offset);
sz += 2;
r_list_foreach_safe (annotation->element_value_pairs, iter, iter_tmp, ev_pairs) {
if (ev_pairs)
sz += r_bin_java_element_pair_calc_size(ev_pairs);
}
return sz;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_annotation_free (void /*RBinJavaAnnotation*/ *a) {
RBinJavaAnnotation *annotation = a;
if (annotation) {
r_list_free (annotation->element_value_pairs);
free (annotation);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_annotation_summary(RBinJavaAnnotation *annotation) {
RListIter *iter = NULL, *iter_tmp = NULL;
RBinJavaElementValuePair *ev_pair = NULL;
if (!annotation) {
// TODO eprintf invalid annotation
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
Eprintf (" Annotation Type Index: 0x%02x\n", annotation->type_idx);
Eprintf (" Annotation Number of EV Pairs: 0x%04x\n", annotation->num_element_value_pairs);
Eprintf (" Annotation EV Pair Values:\n");
if (annotation->element_value_pairs) {
r_list_foreach_safe (annotation->element_value_pairs, iter, iter_tmp, ev_pair) {
r_bin_java_print_element_pair_summary (ev_pair);
}
}
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_element_pair_calc_size(RBinJavaElementValuePair *ev_pair) {
ut64 sz = 0;
if (ev_pair == NULL)
return sz;
//ev_pair->element_name_idx = r_bin_java_read_short(bin, bin->b->cur);
sz += 2;
//ev_pair->value = r_bin_java_element_value_new (bin, offset+2);
if (ev_pair->value)
sz += r_bin_java_element_value_calc_size (ev_pair->value);
return sz;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_element_value_calc_size(RBinJavaElementValue *element_value) {
RListIter *iter, *iter_tmp;
RBinJavaElementValue* ev_element;
RBinJavaElementValuePair *ev_pairs;
ut64 sz = 0;
if (element_value == NULL)
return sz;
// tag
sz += 1;
switch (element_value->tag) {
case R_BIN_JAVA_EV_TAG_BYTE:
case R_BIN_JAVA_EV_TAG_CHAR:
case R_BIN_JAVA_EV_TAG_DOUBLE:
case R_BIN_JAVA_EV_TAG_FLOAT:
case R_BIN_JAVA_EV_TAG_INT:
case R_BIN_JAVA_EV_TAG_LONG:
case R_BIN_JAVA_EV_TAG_SHORT:
case R_BIN_JAVA_EV_TAG_BOOLEAN:
case R_BIN_JAVA_EV_TAG_STRING:
// look up value in bin->cp_list
// (ut16) read and set const_value.const_value_idx
//element_value->value.const_value.const_value_idx = r_bin_java_read_short(bin, bin->b->cur);
sz += 2;
break;
case R_BIN_JAVA_EV_TAG_ENUM:
// (ut16) read and set enum_const_value.type_name_idx
//element_value->value.enum_const_value.type_name_idx = r_bin_java_read_short(bin, bin->b->cur);
sz += 2;
// (ut16) read and set enum_const_value.const_name_idx
//element_value->value.enum_const_value.const_name_idx = r_bin_java_read_short(bin, bin->b->cur);
sz += 2;
break;
case R_BIN_JAVA_EV_TAG_CLASS:
// (ut16) read and set class_value.class_info_idx
//element_value->value.class_value.class_info_idx = r_bin_java_read_short(bin, bin->b->cur);
sz += 2;
break;
case R_BIN_JAVA_EV_TAG_ARRAY:
// (ut16) read and set array_value.num_values
//element_value->value.array_value.num_values = r_bin_java_read_short(bin, bin->b->cur);
sz += 2;
r_list_foreach_safe (element_value->value.array_value.values, iter, iter_tmp, ev_element) {
if (ev_element) {
sz += r_bin_java_element_value_calc_size(ev_element);
}
}
break;
case R_BIN_JAVA_EV_TAG_ANNOTATION:
// annotation new is not used here.
// (ut16) read and set annotation_value.type_idx;
//element_value->value.annotation_value.type_idx = r_bin_java_read_short(bin, bin->b->cur);
sz += 2;
// (ut16) read and set annotation_value.num_element_value_pairs;
//element_value->value.annotation_value.num_element_value_pairs = r_bin_java_read_short(bin, bin->b->cur);
sz += 2;
element_value->value.annotation_value.element_value_pairs = r_list_newf (r_bin_java_element_pair_free);
r_list_foreach_safe (element_value->value.annotation_value.element_value_pairs, iter, iter_tmp, ev_pairs) {
if (ev_pairs) {
sz += r_bin_java_element_pair_calc_size(ev_pairs);
}
}
break;
default:
// eprintf unable to handle tag
break;
}
return sz;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaElementValue* r_bin_java_element_value_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
ut32 i = 0;
ut64 offset = 0;
RBinJavaElementValue* element_value = R_NEW0(RBinJavaElementValue);
RBinJavaElementValuePair* ev_pairs = NULL;
element_value->metas = R_NEW0 (RBinJavaMetaInfo);
element_value->file_offset = buf_offset;
element_value->tag = buffer[offset];
element_value->size += 1;
offset += 1;
element_value->metas->type_info = (void *) r_bin_java_get_ev_meta_from_tag(element_value->tag);
switch(element_value->tag) {
case R_BIN_JAVA_EV_TAG_BYTE:
case R_BIN_JAVA_EV_TAG_CHAR:
case R_BIN_JAVA_EV_TAG_DOUBLE:
case R_BIN_JAVA_EV_TAG_FLOAT:
case R_BIN_JAVA_EV_TAG_INT:
case R_BIN_JAVA_EV_TAG_LONG:
case R_BIN_JAVA_EV_TAG_SHORT:
case R_BIN_JAVA_EV_TAG_BOOLEAN:
case R_BIN_JAVA_EV_TAG_STRING:
// look up value in bin->cp_list
// (ut16) read and set const_value.const_value_idx
element_value->value.const_value.const_value_idx = R_BIN_JAVA_USHORT (buffer, offset);
element_value->size += 2;
offset += 2;
// look-up, deep copy, and set const_value.const_value_cp_obj
element_value->value.const_value.const_value_cp_obj = r_bin_java_clone_cp_idx (R_BIN_JAVA_GLOBAL_BIN, element_value->value.const_value.const_value_idx);
break;
case R_BIN_JAVA_EV_TAG_ENUM:
// (ut16) read and set enum_const_value.type_name_idx
element_value->value.enum_const_value.type_name_idx = R_BIN_JAVA_USHORT (buffer, offset);
element_value->size += 2;
offset += 2;
// (ut16) read and set enum_const_value.const_name_idx
element_value->value.enum_const_value.const_name_idx = R_BIN_JAVA_USHORT (buffer, offset);
element_value->size += 2;
offset += 2;
// look up type_name_index in bin->cp_list
// look-up, deep copy, and set enum_const_value.const_name_cp_obj
element_value->value.enum_const_value.const_name_cp_obj = r_bin_java_clone_cp_idx (R_BIN_JAVA_GLOBAL_BIN, element_value->value.enum_const_value.const_name_idx);
// look-up, deep copy, and set enum_const_value.type_name_cp_obj
element_value->value.enum_const_value.type_name_cp_obj = r_bin_java_clone_cp_idx (R_BIN_JAVA_GLOBAL_BIN, element_value->value.enum_const_value.type_name_idx);
break;
case R_BIN_JAVA_EV_TAG_CLASS:
// (ut16) read and set class_value.class_info_idx
element_value->value.class_value.class_info_idx = R_BIN_JAVA_USHORT (buffer, offset);
element_value->size += 2;
offset += 2;
// look up type_name_index in bin->cp_list
// look-up, deep copy, and set class_value.class_info_cp_obj
element_value->value.class_value.class_info_cp_obj = r_bin_java_clone_cp_idx (R_BIN_JAVA_GLOBAL_BIN, element_value->value.class_value.class_info_idx);
break;
case R_BIN_JAVA_EV_TAG_ARRAY:
// (ut16) read and set array_value.num_values
element_value->value.array_value.num_values = R_BIN_JAVA_USHORT (buffer, offset);
element_value->size += 2;
offset += 2;
element_value->value.array_value.values = r_list_new ();
for (i = 0; i < element_value->value.array_value.num_values; i++) {
RBinJavaElementValue* ev_element = r_bin_java_element_value_new (buffer+offset, sz-offset, buf_offset+offset);
if (ev_element) {
element_value->size += ev_element->size;
offset += ev_element->size;
}
// read array_value.num_values, and append to array_value.values
r_list_append (element_value->value.array_value.values, (void *) ev_element);
if (ev_element == NULL) {
// TODO: eprintf error when reading element value
}
}
break;
case R_BIN_JAVA_EV_TAG_ANNOTATION:
// annotation new is not used here.
// (ut16) read and set annotation_value.type_idx;
element_value->value.annotation_value.type_idx = R_BIN_JAVA_USHORT (buffer, offset);
element_value->size += 2;
offset += 2;
// (ut16) read and set annotation_value.num_element_value_pairs;
element_value->value.annotation_value.num_element_value_pairs = R_BIN_JAVA_USHORT (buffer, offset);
element_value->size += 2;
offset += 2;
element_value->value.annotation_value.element_value_pairs = r_list_newf (r_bin_java_element_pair_free);
// read annotation_value.num_element_value_pairs, and append to annotation_value.element_value_pairs
for (i = 0; i < element_value->value.annotation_value.num_element_value_pairs; i++) {
ev_pairs = r_bin_java_element_pair_new (buffer+offset, sz-offset, buf_offset+offset);
if (ev_pairs) {
element_value->size += ev_pairs->size;
offset += ev_pairs->size;
}
if(ev_pairs == NULL) {
// TODO: eprintf error when reading element pair
}
r_list_append (element_value->value.annotation_value.element_value_pairs, (void *) ev_pairs);
}
break;
default:
// eprintf unable to handle tag
break;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return element_value;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_bootstrap_method_argument_free (void /*RBinJavaBootStrapArgument*/ *b) {
RBinJavaBootStrapArgument *bsm_arg = b;
if (bsm_arg) {
if (bsm_arg->argument_info_cp_obj) {
((RBinJavaCPTypeMetas *) bsm_arg->argument_info_cp_obj)->allocs->delete_obj (bsm_arg->argument_info_cp_obj);
bsm_arg->argument_info_cp_obj = NULL;
}
free (bsm_arg);
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_bootstrap_method_argument_summary(RBinJavaBootStrapArgument* bsm_arg) {
if(bsm_arg == NULL) {
eprintf ("Attempting to print an invalid RBinJavaBootStrapArgument *.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf ("Bootstrap Method Argument Information:\n");
eprintf (" Offset: 0x%08"PFMT64x"", bsm_arg->file_offset);
eprintf (" Name_And_Type Index = (0x%02x)\n", bsm_arg->argument_info_idx);
if (bsm_arg->argument_info_cp_obj) {
eprintf (" Bootstrap Method Argument Type and Name Info:\n");
((RBinJavaCPTypeMetas *) bsm_arg->argument_info_cp_obj)->allocs->print_summary (bsm_arg->argument_info_cp_obj);
}
else
eprintf (" Bootstrap Method Argument Type and Name Info: INVALID\n");
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_bootstrap_method_summary(RBinJavaBootStrapMethod* bsm) {
RBinJavaBootStrapArgument* bsm_arg = NULL;
RListIter *iter = NULL, *iter_tmp=NULL;
if(bsm == NULL) {
eprintf ("Attempting to print an invalid RBinJavaBootStrapArgument *.\n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf ("Bootstrap Method Information:\n");
eprintf (" Offset: 0x%08"PFMT64x"", bsm->file_offset);
eprintf (" Method Reference Index = (0x%02x)\n", bsm->bootstrap_method_ref);
eprintf (" Number of Method Arguments = (0x%02x)\n", bsm->num_bootstrap_arguments);
if (bsm->bootstrap_arguments) {
r_list_foreach_safe (bsm->bootstrap_arguments, iter, iter_tmp, bsm_arg) {
if(bsm_arg)
r_bin_java_print_bootstrap_method_argument_summary (bsm_arg);
}
}
else
eprintf (" Bootstrap Method Argument: NONE \n");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RBinJavaBootStrapArgument* r_bin_java_bootstrap_method_argument_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
RBinJavaBootStrapArgument *bsm_arg = NULL;
ut64 offset = 0;
bsm_arg = (RBinJavaBootStrapArgument *) malloc (sizeof (RBinJavaBootStrapArgument));
if (bsm_arg == NULL) {
// TODO eprintf failed to allocate bytes for bootstrap_method.
return bsm_arg;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
memset (bsm_arg, 0, sizeof (RBinJavaBootStrapArgument));
bsm_arg->file_offset = buf_offset;
bsm_arg->argument_info_idx = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
bsm_arg->argument_info_cp_obj = r_bin_java_clone_cp_idx (R_BIN_JAVA_GLOBAL_BIN, bsm_arg->argument_info_idx);
bsm_arg->size = offset;
return bsm_arg;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_bootstrap_method_free (void /*/RBinJavaBootStrapMethod*/ *b) {
RBinJavaBootStrapMethod *bsm = b;
RListIter *iter, *iter_tmp;
RBinJavaBootStrapArgument *obj = NULL;
if (bsm) {
if (bsm->bootstrap_arguments) {
r_list_foreach_safe (bsm->bootstrap_arguments, iter, iter_tmp, obj) {
if(obj)
r_bin_java_bootstrap_method_argument_free (obj);
//r_list_delete (bsm->bootstrap_arguments, iter);
}
r_list_free (bsm->bootstrap_arguments);
bsm->bootstrap_arguments = NULL;
}
free (bsm);
}
}
R_API RBinJavaBootStrapMethod* r_bin_java_bootstrap_method_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
RBinJavaBootStrapMethod *bsm = NULL;
RBinJavaBootStrapArgument *bsm_arg = NULL;
ut32 i = 0;
ut64 offset = 0;
bsm = (RBinJavaBootStrapMethod *) malloc (sizeof (RBinJavaBootStrapMethod));
if (bsm == NULL) {
// TODO eprintf failed to allocate bytes for bootstrap_method.
return bsm;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
memset (bsm, 0, sizeof (RBinJavaBootStrapMethod));
bsm->file_offset = buf_offset;
bsm->bootstrap_method_ref = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
bsm->num_bootstrap_arguments = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
bsm->bootstrap_arguments = r_list_new ();
for (i = 0; i < bsm->num_bootstrap_arguments; i++) {
//bsm_arg = r_bin_java_bootstrap_method_argument_new (bin, bin->b->cur);
bsm_arg = r_bin_java_bootstrap_method_argument_new (buffer+offset, sz-offset, buf_offset+offset);
if(bsm_arg) {
offset += bsm_arg->size;
r_list_append (bsm->bootstrap_arguments, (void *) bsm_arg);
} else {
// TODO eprintf Failed to read the %d boot strap method.
}
}
bsm->size = offset;
return bsm;
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_bootstrap_methods_attr_summary(RBinJavaAttrInfo *attr) {
RListIter *iter, *iter_tmp;
RBinJavaBootStrapMethod *obj = NULL;
if (attr == NULL || attr->type == R_BIN_JAVA_ATTR_TYPE_BOOTSTRAP_METHODS_ATTR) {
eprintf ("Unable to print attribue summary for RBinJavaAttrInfo *RBinJavaBootstrapMethodsAttr");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf ("Bootstrap Methods Attribute Information Information:\n");
eprintf (" Attribute Offset: 0x%08"PFMT64x"", attr->file_offset);
eprintf (" Length: 0x%08x", attr->length);
eprintf (" Number of Method Arguments = (0x%02x)\n", attr->info.bootstrap_methods_attr.num_bootstrap_methods);
if (attr->info.bootstrap_methods_attr.bootstrap_methods) {
r_list_foreach_safe (attr->info.bootstrap_methods_attr.bootstrap_methods, iter, iter_tmp, obj) {
if(obj)
r_bin_java_print_bootstrap_method_summary (obj);
}
} else {
eprintf (" Bootstrap Methods: NONE \n");
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_bootstrap_methods_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo *attr = a;
if(attr && attr->type == R_BIN_JAVA_ATTR_TYPE_BOOTSTRAP_METHODS_ATTR) {
free (attr->name);
free (attr->metas);
r_list_free (attr->info.bootstrap_methods_attr.bootstrap_methods);
free (attr);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_bootstrap_methods_attr_calc_size(RBinJavaAttrInfo* attr) {
RListIter *iter, *iter_tmp;
RBinJavaBootStrapMethod *bsm = NULL;
ut64 size = 0;
if (attr) {
size += 6;
//attr->info.bootstrap_methods_attr.num_bootstrap_methods = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
r_list_foreach_safe (attr->info.bootstrap_methods_attr.bootstrap_methods, iter, iter_tmp, bsm) {
if(bsm) {
size += r_bin_java_bootstrap_method_calc_size(bsm);
} else {
// TODO eprintf Failed to read the %d boot strap method.
}
}
}
return size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_bootstrap_arg_calc_size(RBinJavaBootStrapArgument *bsm_arg) {
ut64 size = 0;
if (bsm_arg) {
//bsm_arg->argument_info_idx = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_bootstrap_method_calc_size(RBinJavaBootStrapMethod *bsm) {
RListIter *iter, *iter_tmp;
RBinJavaBootStrapArgument *bsm_arg = NULL;
ut64 size = 0;
if (bsm) {
size += 6;
//bsm->bootstrap_method_ref = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
//bsm->num_bootstrap_arguments = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
r_list_foreach_safe (bsm->bootstrap_arguments, iter, iter_tmp, bsm_arg) {
if(bsm_arg) {
size += r_bin_java_bootstrap_arg_calc_size(bsm_arg);
} else {
// TODO eprintf Failed to read the %d boot strap method.
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_bootstrap_methods_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
ut32 i = 0;
RBinJavaBootStrapMethod *bsm = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
RBinJavaAttrInfo *attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
offset += 6;
if(attr) {
attr->type = R_BIN_JAVA_ATTR_TYPE_BOOTSTRAP_METHODS_ATTR;
attr->info.bootstrap_methods_attr.num_bootstrap_methods = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
attr->info.bootstrap_methods_attr.bootstrap_methods = r_list_newf (r_bin_java_bootstrap_method_free);
for (i = 0; i < attr->info.bootstrap_methods_attr.num_bootstrap_methods; i++) {
//bsm = r_bin_java_bootstrap_method_new (bin, bin->b->cur);
bsm = r_bin_java_bootstrap_method_new (buffer+offset, sz-offset, buf_offset+offset);
if(bsm) {
offset += bsm->size;
r_list_append (attr->info.bootstrap_methods_attr.bootstrap_methods, (void *) bsm);
} else {
// TODO eprintf Failed to read the %d boot strap method.
}
}
attr->size = offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return attr;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_annotation_default_attr_summary(RBinJavaAttrInfo *attr) {
if(attr && attr->type == R_BIN_JAVA_ATTR_TYPE_ANNOTATION_DEFAULT_ATTR) {
eprintf ("Annotation Default Attribute Information:\n");
eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
eprintf (" Attribute Length: %d\n", attr->length);
r_bin_java_print_element_value_summary ((attr->info.annotation_default_attr.default_value));
} else {
// TODO: eprintf attr is invalid
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_annotation_array_free (void /*RBinJavaAnnotationsArray*/ *a) {
RBinJavaAnnotationsArray *annotation_array = a;
RListIter *iter = NULL, *iter_tmp = NULL;
RBinJavaAnnotation *annotation;
if (annotation_array->annotations == NULL) {
// TODO eprintf
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
r_list_foreach_safe (annotation_array->annotations, iter, iter_tmp, annotation) {
if (annotation)
r_bin_java_annotation_free (annotation);
//r_list_delete (annotation_array->annotations, iter);
}
r_list_free (annotation_array->annotations);
free (annotation_array);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_annotation_array_summary(RBinJavaAnnotationsArray *annotation_array) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RListIter *iter = NULL, *iter_tmp = NULL;
RBinJavaAnnotation *annotation;
if (annotation_array->annotations == NULL) {
// TODO eprintf
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
return;
}
eprintf (" Annotation Array Information:\n");
eprintf (" Number of Annotation Array Elements: %d\n", annotation_array->num_annotations);
r_list_foreach_safe (annotation_array->annotations, iter, iter_tmp, annotation) {
r_bin_java_print_annotation_summary (annotation);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
R_API RBinJavaAnnotationsArray* r_bin_java_annotation_array_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
RBinJavaAnnotation *annotation;
RBinJavaAnnotationsArray *annotation_array;
ut32 i;
ut64 offset = 0;
annotation_array = (RBinJavaAnnotationsArray *) malloc (sizeof (RBinJavaAnnotationsArray));
if (annotation_array == NULL) {
// TODO eprintf
return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
annotation_array->num_annotations = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
annotation_array->annotations = r_list_new ();
for (i=0; i < annotation_array->num_annotations; i++) {
annotation = r_bin_java_annotation_new (buffer+offset, sz-offset, buf_offset+offset);
if (annotation) {
offset += annotation->size;
}
if (annotation == NULL) {
// TODO eprintf
}
r_list_append (annotation_array->annotations, (void *) annotation);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
annotation_array->size = offset;
return annotation_array;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_rtv_annotations_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
ut32 i = 0;
RBinJavaAttrInfo *attr = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
offset += 6;
if(attr) {
attr->type = R_BIN_JAVA_ATTR_TYPE_RUNTIME_VISIBLE_ANNOTATION_ATTR;
attr->info.annotation_array.num_annotations = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
attr->info.annotation_array.annotations = r_list_newf (r_bin_java_annotation_free);
for (i=0; i < attr->info.annotation_array.num_annotations; i++) {
RBinJavaAnnotation* annotation = r_bin_java_annotation_new (buffer+offset, sz-offset, buf_offset+offset);
if (annotation == NULL) {
}
if (annotation) {
offset += annotation->size;
}
r_list_append (attr->info.annotation_array.annotations, (void *) annotation);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->size = offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return attr;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_annotation_array_calc_size(RBinJavaAnnotationsArray* annotation_array) {
ut64 size = 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RListIter *iter = NULL, *iter_tmp = NULL;
RBinJavaAnnotation *annotation;
if (annotation_array->annotations == NULL) {
// TODO eprintf
return size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
//annotation_array->num_annotations = R_BIN_JAVA_USHORT (buffer, offset);
size += 2;
r_list_foreach_safe (annotation_array->annotations, iter, iter_tmp, annotation) {
size += r_bin_java_annotation_calc_size(annotation);
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_rtv_annotations_attr_calc_size(RBinJavaAttrInfo* attr) {
ut64 size = 0;
if (attr == NULL) {
// TODO eprintf allocation fail
return size;
}
size += (6 + r_bin_java_annotation_array_calc_size(&(attr->info.annotation_array)));
return size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_rti_annotations_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 i = 0;
RBinJavaAttrInfo *attr = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
offset += 6;
if(attr) {
attr->type = R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_ANNOTATION_ATTR;
attr->info.annotation_array.num_annotations = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
attr->info.annotation_array.annotations = r_list_newf (r_bin_java_annotation_free);
for (i=0; i < attr->info.rtv_annotations_attr.num_annotations; i++) {
RBinJavaAnnotation* annotation = r_bin_java_annotation_new (buffer+offset, sz-offset, buf_offset+offset);
if (annotation)
offset += annotation->size;
r_list_append (attr->info.annotation_array.annotations, (void *) annotation);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->size = offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return attr;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_rti_annotations_attr_calc_size(RBinJavaAttrInfo* attr) {
ut64 size = 0;
if (attr == NULL) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
// TODO eprintf allocation fail
return size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
size += (6 + r_bin_java_annotation_array_calc_size(&(attr->info.annotation_array)));
return size;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_rtv_annotations_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo * attr = a;
if(attr && attr->type == R_BIN_JAVA_ATTR_TYPE_RUNTIME_VISIBLE_ANNOTATION_ATTR) {
r_list_free (attr->info.annotation_array.annotations);
free (attr->metas);
free (attr->name);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_rti_annotations_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo * attr = a;
if (attr && attr->type == R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_ANNOTATION_ATTR) {
r_list_free (attr->info.annotation_array.annotations);
free (attr->metas);
free (attr->name);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_rtv_annotations_attr_summary(RBinJavaAttrInfo *attr) {
if (attr && attr->type == R_BIN_JAVA_ATTR_TYPE_RUNTIME_VISIBLE_ANNOTATION_ATTR) {
Eprintf ("Runtime Visible Annotations Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
r_bin_java_print_annotation_array_summary (&attr->info.annotation_array);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_rti_annotations_attr_summary(RBinJavaAttrInfo *attr) {
if (attr && attr->type == R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_ANNOTATION_ATTR) {
Eprintf ("Runtime Invisible Annotations Attribute Information:\n");
Eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
Eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
Eprintf (" Attribute Length: %d\n", attr->length);
r_bin_java_print_annotation_array_summary (&attr->info.annotation_array);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_rtip_annotations_attr_calc_size(RBinJavaAttrInfo* attr) {
ut64 size = 0;
RListIter *iter = NULL, *iter_tmp = NULL;
RBinJavaAnnotationsArray *annotation_array;
if (attr == NULL) {
// TODO eprintf allocation fail
return size;
}
//attr->info.rtip_annotations_attr.num_parameters = buffer[offset];
size += (6 + 1);
r_list_foreach_safe (attr->info.rtip_annotations_attr.parameter_annotations, iter, iter_tmp, annotation_array) {
if(annotation_array)
size += r_bin_java_annotation_array_calc_size(annotation_array);
}
return size;
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_rtip_annotations_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut32 i = 0;
RBinJavaAttrInfo *attr = NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
ut64 offset = 0;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
offset += 6;
RBinJavaAnnotationsArray *annotation_array;
if(attr) {
attr->type = R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATION_ATTR;
attr->info.rtip_annotations_attr.num_parameters = buffer[offset];
offset += 1;
attr->info.rtip_annotations_attr.parameter_annotations = r_list_newf (r_bin_java_annotation_array_free);
for (i=0; i < attr->info.rtip_annotations_attr.num_parameters; i++) {
annotation_array = r_bin_java_annotation_array_new (buffer+offset, sz-offset, buf_offset+offset);
if (annotation_array == NULL) {
}
if (annotation_array)
offset += annotation_array->size;
r_list_append (attr->info.rtip_annotations_attr.parameter_annotations, (void *) annotation_array);
}
attr->size = offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return attr;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RBinJavaAttrInfo* r_bin_java_rtvp_annotations_attr_new (ut8* buffer, ut64 sz, ut64 buf_offset) {
ut32 i = 0;
RBinJavaAttrInfo *attr = NULL;
ut64 offset = 0;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
offset += 6;
RBinJavaAnnotationsArray *annotation_array;
if(attr) {
attr->type = R_BIN_JAVA_ATTR_TYPE_RUNTIME_VISIBLE_PARAMETER_ANNOTATION_ATTR;
attr->info.rtvp_annotations_attr.num_parameters = buffer[offset];
offset += 1;
attr->info.rtvp_annotations_attr.parameter_annotations = r_list_newf (r_bin_java_annotation_array_free);
for (i=0; i < attr->info.rtvp_annotations_attr.num_parameters; i++) {
annotation_array = r_bin_java_annotation_array_new (buffer+offset, sz-offset, buf_offset+offset);
if (annotation_array == NULL) {
}
if (annotation_array)
offset += annotation_array->size;
r_list_append (attr->info.rtvp_annotations_attr.parameter_annotations, (void *) annotation_array);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
attr->size = offset;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return attr;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API ut64 r_bin_java_rtvp_annotations_attr_calc_size(RBinJavaAttrInfo* attr) {
ut64 size = 0;
RListIter *iter = NULL, *iter_tmp = NULL;
RBinJavaAnnotationsArray *annotation_array;
if (!attr) return size;
size += (6+ 1);
r_list_foreach_safe (attr->info.rtvp_annotations_attr.parameter_annotations,
iter, iter_tmp, annotation_array) {
if (annotation_array)
size += r_bin_java_annotation_array_calc_size (
annotation_array);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return size;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_rtvp_annotations_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo *attr = a;
if (attr) {
if (attr->type == R_BIN_JAVA_ATTR_TYPE_RUNTIME_VISIBLE_PARAMETER_ANNOTATION_ATTR) {
r_list_free (attr->info.rtvp_annotations_attr.parameter_annotations);
}
free (attr->name);
free (attr->metas);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_rtip_annotations_attr_free (void /*RBinJavaAttrInfo*/ *a) {
RBinJavaAttrInfo *attr = a;
if (attr) { // && attr->type == R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATION_ATTR) {
r_list_free (attr->info.rtip_annotations_attr.parameter_annotations);
free (attr->metas);
free (attr->name);
free (attr);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_rtvp_annotations_attr_summary(RBinJavaAttrInfo *attr) {
RBinJavaAnnotationsArray *annotation_array = NULL;
RListIter *iter = NULL, *iter_tmp = NULL;
if(attr && attr->type == R_BIN_JAVA_ATTR_TYPE_RUNTIME_VISIBLE_PARAMETER_ANNOTATION_ATTR) {
eprintf ("Runtime Visible Parameter Annotations Attribute Information:\n");
eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
eprintf (" Attribute Length: %d\n", attr->length);
eprintf (" Number of Runtime Invisible Parameters: %d\n", attr->info.rtvp_annotations_attr.num_parameters);
r_list_foreach_safe (attr->info.rtvp_annotations_attr.parameter_annotations, iter, iter_tmp, annotation_array) {
r_bin_java_print_annotation_array_summary (annotation_array);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
}
2014-06-25 02:11:43 +00:00
R_API void r_bin_java_print_rtip_annotations_attr_summary(RBinJavaAttrInfo *attr) {
RBinJavaAnnotationsArray *annotation_array = NULL;
RListIter *iter = NULL, *iter_tmp = NULL;
if(attr && attr->type == R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATION_ATTR) {
eprintf ("Runtime Invisible Parameter Annotations Attribute Information:\n");
eprintf (" Attribute Offset: 0x%08"PFMT64x"\n", attr->file_offset);
eprintf (" Attribute Name Index: %d (%s)\n", attr->name_idx, attr->name);
eprintf (" Attribute Length: %d\n", attr->length);
eprintf (" Number of Runtime Invisible Parameters: %d\n", attr->info.rtip_annotations_attr.num_parameters);
r_list_foreach_safe (attr->info.rtip_annotations_attr.parameter_annotations, iter, iter_tmp, annotation_array) {
r_bin_java_print_annotation_array_summary (annotation_array);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
R_API RBinJavaCPTypeObj *r_bin_java_find_cp_name_and_type_info(RBinJavaObj *bin, ut16 name_idx, ut16 descriptor_idx) {
RListIter *iter, *iter_tmp;
RBinJavaCPTypeObj *res= NULL, *obj = NULL;
IFDBG eprintf ("Looking for name_idx: %d and descriptor_idx: %d\n", name_idx, descriptor_idx);
r_list_foreach_safe (bin->cp_list, iter, iter_tmp, obj) {
if (obj && obj->tag == R_BIN_JAVA_CP_NAMEANDTYPE) {
IFDBG eprintf ("RBinJavaCPTypeNameAndType has name_idx: %d and descriptor_idx: %d\n",
obj->info.cp_name_and_type.name_idx, obj->info.cp_name_and_type.descriptor_idx);
if (obj->info.cp_name_and_type.name_idx == name_idx &&
obj->info.cp_name_and_type.descriptor_idx == descriptor_idx) {
res = obj;
break;
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-05-12 08:16:15 +00:00
R_API char * r_bin_java_resolve_cp_idx_type(RBinJavaObj *BIN_OBJ, int idx) {
RBinJavaCPTypeObj *item = NULL;
2015-08-18 14:21:21 +00:00
char *str = NULL;
if (BIN_OBJ && BIN_OBJ->cp_count < 1) {
//r_bin_java_new_bin(BIN_OBJ);
return NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
item = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
if (item) {
str = strdup (((RBinJavaCPTypeMetas *) item->metas->type_info)->name);
} else {
str = strdup ("INVALID");
}
return str;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_API RBinJavaCPTypeObj *r_bin_java_find_cp_ref_info_from_name_and_type (RBinJavaObj *bin, ut16 name_idx, ut16 descriptor_idx) {
RBinJavaCPTypeObj *obj = r_bin_java_find_cp_name_and_type_info (bin, name_idx, descriptor_idx);
if (obj) {
return r_bin_java_find_cp_ref_info (bin, obj->metas->ord);
}
return NULL;
}
R_API RBinJavaCPTypeObj *r_bin_java_find_cp_ref_info(RBinJavaObj *bin, ut16 name_and_type_idx) {
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
RListIter *iter, *iter_tmp;
RBinJavaCPTypeObj *res= NULL, *obj = NULL;
r_list_foreach_safe (bin->cp_list, iter, iter_tmp, obj) {
2015-02-17 23:28:53 +00:00
if (obj->tag == R_BIN_JAVA_CP_FIELDREF &&
obj->info.cp_field.name_and_type_idx == name_and_type_idx) {
res = obj;
break;
} else if (obj->tag == R_BIN_JAVA_CP_METHODREF &&
obj->info.cp_method.name_and_type_idx == name_and_type_idx) {
res = obj;
break;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_resolve(RBinJavaObj *BIN_OBJ, int idx, ut8 space_bn_name_type) {
// TODO XXX FIXME add a size parameter to the str when it is passed in
RBinJavaCPTypeObj *item = NULL, *item2 = NULL;
char *class_str = NULL,
*name_str = NULL,
*desc_str = NULL,
*string_str = NULL,
*empty = "",
*cp_name = NULL,
*str = NULL;
if (BIN_OBJ && BIN_OBJ->cp_count < 1) {
//r_bin_java_new_bin(BIN_OBJ);
return NULL;
}
item = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
if (item) {
cp_name = ((RBinJavaCPTypeMetas *) item->metas->type_info)->name;
IFDBG eprintf("java_resolve Resolved: (%d) %s\n", idx, cp_name);
} else {
str = malloc (512);
if (str)
snprintf (str,512, "(%d) INVALID CP_OBJ", idx);
return str;
}
cp_name = ((RBinJavaCPTypeMetas *) item->metas->type_info)->name;
if (strcmp (cp_name, "Class") == 0) {
item2 = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
//str = r_bin_java_get_name_from_bin_cp_list (BIN_OBJ, idx-1);
class_str = empty;
class_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!class_str)
class_str = empty;
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item2);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item2);
if (!desc_str)
desc_str = empty;
str = r_str_newf ("%s%s%s", name_str,
space_bn_name_type?" ":"", desc_str);
if (class_str != empty)
free (class_str);
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
} else if (!strcmp (cp_name, "MethodRef") ||
!strcmp (cp_name, "FieldRef") ||
!strcmp (cp_name, "InterfaceMethodRef")) {
/*
* The MethodRef, FieldRef, and InterfaceMethodRef structures
*/
class_str = r_bin_java_get_name_from_bin_cp_list (BIN_OBJ, item->info.cp_method.class_idx);
if (!class_str)
class_str = empty;
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item);
if (!desc_str)
desc_str = empty;
str = r_str_newf ("%s/%s%s%s", class_str, name_str,
space_bn_name_type?" ":"", desc_str);
if (class_str != empty)
free (class_str);
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
} else if (!strcmp (cp_name, "String")) {
string_str = r_bin_java_get_utf8_from_bin_cp_list (BIN_OBJ, item->info.cp_string.string_idx);
str = NULL;
IFDBG eprintf("java_resolve String got: (%d) %s\n", item->info.cp_string.string_idx, string_str);
if (!string_str) {
string_str = empty;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
str = r_str_newf ("\"%s\"", string_str);
IFDBG eprintf("java_resolve String return: %s\n", str);
if (string_str != empty)
free (string_str);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
} else if (!strcmp (cp_name, "Utf8")) {
char *tmp_str = convert_string ((const char *) item->info.cp_utf8.bytes, item->info.cp_utf8.length);
ut32 tmp_str_len = tmp_str ? strlen (tmp_str) + 4 : 0;
if (tmp_str) {
str = malloc (tmp_str_len + 4);
snprintf (str, tmp_str_len + 4, "\"%s\"", tmp_str);
}
free (tmp_str);
} else if (!strcmp (cp_name, "Long")) {
str = r_str_newf ("0x%"PFMT64x, r_bin_java_raw_to_long (item->info.cp_long.bytes.raw,0));
} else if (!strcmp (cp_name, "Double")) {
str = r_str_newf ("%f", r_bin_java_raw_to_double (item->info.cp_double.bytes.raw,0));
} else if (!strcmp (cp_name, "Integer")) {
str = r_str_newf ("0x%08x", R_BIN_JAVA_UINT (item->info.cp_integer.bytes.raw,0));
} else if (!strcmp (cp_name, "Float")) {
str = r_str_newf ("%f", R_BIN_JAVA_FLOAT (item->info.cp_float.bytes.raw,0));
} else if (!strcmp (cp_name, "NameAndType")) {
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item);
if (!desc_str)
desc_str = empty;
str = r_str_newf ("%s%s%s", name_str, space_bn_name_type?" ":"", desc_str);
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
} else {
str = strdup ("(null)");
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return str;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API ut8 r_bin_java_does_cp_idx_ref_method(RBinJavaObj *BIN_OBJ, int idx) {
RBinJavaField *fm_type = NULL;
RListIter *iter;
ut8 res = 0;
r_list_foreach (BIN_OBJ->methods_list, iter, fm_type) {
if (fm_type->field_ref_cp_obj->metas->ord == idx) {
res = 1;
break;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API ut8 r_bin_java_does_cp_idx_ref_field(RBinJavaObj *BIN_OBJ, int idx) {
RBinJavaField *fm_type = NULL;
RListIter *iter;
ut8 res = 0;
r_list_foreach (BIN_OBJ->fields_list, iter, fm_type) {
if (fm_type->field_ref_cp_obj->metas->ord == idx) {
res = 1;
break;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API char * r_bin_java_get_method_name(RBinJavaObj *bin_obj, ut32 idx) {
char *name = NULL;
if (idx < r_list_length (bin_obj->methods_list)) {
RBinJavaField *fm_type = r_list_get_n (bin_obj->methods_list, idx);
name = strdup (fm_type->name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return name;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-05-12 08:16:15 +00:00
R_API RList* r_bin_java_get_method_num_name(RBinJavaObj *bin_obj) {
ut32 i = 0;
RListIter *iter = NULL;
RBinJavaField *fm_type;
RList *res = r_list_newf (free);
r_list_foreach (bin_obj->methods_list, iter, fm_type) {
ut32 len = strlen (fm_type->name) + 30;
char *str = malloc (len);
snprintf (str, len, "%d %s", i, fm_type->name);
++i;
r_list_append (res, str);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
/*
2014-06-25 02:11:43 +00:00
R_API int r_bin_java_does_cp_obj_ref_idx (RBinJavaObj *bin_obj, RBinJavaCPTypeObj *cp_obj, ut16 idx) {
2015-09-14 00:08:31 +00:00
int res = false;
RBinJavaCPTypeObj *t_obj = NULL;
if (cp_obj) {
switch (cp_obj->tag) {
case R_BIN_JAVA_CP_NULL: break;
case R_BIN_JAVA_CP_UTF8: break;
case R_BIN_JAVA_CP_UNKNOWN: break;
case R_BIN_JAVA_CP_INTEGER: break;
case R_BIN_JAVA_CP_FLOAT: break;
case R_BIN_JAVA_CP_LONG: break;
case R_BIN_JAVA_CP_DOUBLE: break;
case R_BIN_JAVA_CP_CLASS:
2015-09-14 00:08:31 +00:00
res = idx == cp_obj->info.cp_class.name_idx ? true : false;
break;
case R_BIN_JAVA_CP_STRING:
2015-09-14 00:08:31 +00:00
res = idx == cp_obj->info.cp_string.string_idx ? true : false;
break;
case R_BIN_JAVA_CP_METHODREF: break;// check if idx is referenced here
case R_BIN_JAVA_CP_INTERFACEMETHOD_REF: break; // check if idx is referenced here
case R_BIN_JAVA_CP_FIELDREF:
t_obj = r_bin_java_get_item_from_cp (bin_obj, cp_obj->info.cp_method.class_idx);
res = r_bin_java_does_cp_obj_ref_idx (bin_obj, t_obj, idx);
2015-09-14 00:08:31 +00:00
if (res == true) break;
t_obj = r_bin_java_get_item_from_cp (bin_obj, cp_obj->info.cp_method.name_and_type_idx);
res = r_bin_java_does_cp_obj_ref_idx (bin_obj, t_obj, idx);
break;
case R_BIN_JAVA_CP_NAMEANDTYPE: break;// check if idx is referenced here
obj->info.cp_name_and_type.name_idx
case R_BIN_JAVA_CP_METHODHANDLE: break;// check if idx is referenced here
case R_BIN_JAVA_CP_METHODTYPE: break;// check if idx is referenced here
case R_BIN_JAVA_CP_INVOKEDYNAMIC: break;// check if idx is referenced here
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
*/
2014-06-25 02:11:43 +00:00
R_API RList * r_bin_java_find_cp_const_by_val_long (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len) {
RList * res = r_list_newf (free);
ut32 *v = NULL;
RListIter *iter;
RBinJavaCPTypeObj *cp_obj;
eprintf ("Looking for 0x%08x\n", R_BIN_JAVA_UINT (bytes, 0));
r_list_foreach (bin_obj->cp_list, iter, cp_obj) {
if (cp_obj->tag == R_BIN_JAVA_CP_LONG) {
if (len == 8 && r_bin_java_raw_to_long (cp_obj->info.cp_long.bytes.raw, 0) == r_bin_java_raw_to_long (bytes, 0)) {
// TODO: we can safely store a ut32 inside the list without having to allocate it
v = malloc (sizeof (ut32));
*v = cp_obj->idx;
r_list_append (res, v);
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-06-25 02:11:43 +00:00
R_API RList * r_bin_java_find_cp_const_by_val_double (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len) {
RList * res = r_list_newf (free);
ut32 *v = NULL;
RListIter *iter;
RBinJavaCPTypeObj *cp_obj;
eprintf ("Looking for %f\n", r_bin_java_raw_to_double (bytes, 0));
r_list_foreach (bin_obj->cp_list, iter, cp_obj) {
if (cp_obj->tag == R_BIN_JAVA_CP_DOUBLE) {
if (len == 8 && r_bin_java_raw_to_double (cp_obj->info.cp_long.bytes.raw, 0) == r_bin_java_raw_to_double (bytes, 0)) {
v = malloc (sizeof (ut32));
*v = cp_obj->idx;
r_list_append (res, v);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
}
}
return res;
}
2014-06-25 02:11:43 +00:00
R_API RList * r_bin_java_find_cp_const_by_val_float (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len) {
RList * res = r_list_newf (free);
ut32 *v = NULL;
RListIter *iter;
RBinJavaCPTypeObj *cp_obj;
eprintf ("Looking for %f\n", R_BIN_JAVA_FLOAT (bytes, 0));
r_list_foreach (bin_obj->cp_list, iter, cp_obj) {
if (cp_obj->tag == R_BIN_JAVA_CP_FLOAT) {
if (len == 4 && R_BIN_JAVA_FLOAT (cp_obj->info.cp_long.bytes.raw, 0) == R_BIN_JAVA_FLOAT (bytes, 0)) {
v = malloc (sizeof (ut32));
*v = cp_obj->idx;
r_list_append (res, v);
}
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return res;
}
R_API RList * r_bin_java_find_cp_const_by_val(RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len, const char t) {
switch (t) {
case R_BIN_JAVA_CP_UTF8: return r_bin_java_find_cp_const_by_val_utf8 (bin_obj, bytes, len);
case R_BIN_JAVA_CP_INTEGER: return r_bin_java_find_cp_const_by_val_int (bin_obj, bytes, len);
case R_BIN_JAVA_CP_FLOAT: return r_bin_java_find_cp_const_by_val_float (bin_obj, bytes, len);
case R_BIN_JAVA_CP_LONG: return r_bin_java_find_cp_const_by_val_long (bin_obj, bytes, len);
case R_BIN_JAVA_CP_DOUBLE: return r_bin_java_find_cp_const_by_val_double (bin_obj, bytes, len);
case R_BIN_JAVA_CP_UNKNOWN:
default:
eprintf ("Failed to perform the search for: %s\n", bytes);
return r_list_new();
}
}
//#if 0
2015-10-25 15:35:47 +00:00
// Attempted to clean up these functions and remove them since they are "unused" but without
// them there are some compile time warnings, because other projects actually depend on these
// for some form of information.
R_API void U(add_cp_objs_to_sdb)(RBinJavaObj *bin) {
/*
Add Constant Pool Serialized Object to an Array
the key for this info is:
Key:
java.<classname>.cp_obj
Each Value varies by type:
In general its:
<ordinal>.<file_offset>.<type_name>.[type specific stuff]
Example:
UTF-8: <ordinal>.<file_offset>.<type_name>.<strlen>.<hexlified(str)>
Integer: <ordinal>.<file_offset>.<type_name>.<abs(int)>
Long: <ordinal>.<file_offset>.<type_name>.abs(long)>
FieldRef/MethodRef: <ordinal>.<file_offset>.<type_name>.<class_idx>.<name_and_type_idx>
*/
ut32 idx = 0, class_name_inheap = 1;
RBinJavaCPTypeObj *cp_obj = NULL;
char * key = NULL,
* value = NULL;
char str_cnt[40];
char * class_name = r_bin_java_get_this_class_name (bin);
ut32 key_buf_size = 0;
if (class_name == NULL) {
class_name = "unknown";
class_name_inheap = 0;
}
// 4 - format, 8 number, 1 null byte, 7 "unknown"
key_buf_size = strlen(class_name) + 4 + 8 + 1;
key = malloc(key_buf_size);
if (key == NULL) {
if (class_name_inheap) free (class_name);
return;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
snprintf(key, key_buf_size-1,"%s.cp_count" , class_name);
key[key_buf_size-1] = 0;
snprintf(str_cnt, 39,"%d" , bin->cp_count);
str_cnt[39] = 0;
sdb_set (bin->kv, key, value, 0);
//sdb_alist(bin->kv, key);
for (idx = 0; idx < bin->cp_count; idx++) {
snprintf(key, key_buf_size-1, "%s.cp.%d", class_name, idx);
key[key_buf_size-1] = 0;
cp_obj = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (bin, idx);
IFDBG eprintf("Adding %s to the sdb.\n", key);
if (cp_obj) {
value = ((RBinJavaCPTypeMetas *)
cp_obj->metas->type_info)->
allocs->stringify_obj (cp_obj);
sdb_set (bin->kv, key, value, 0);
free (value);
}
}
if (class_name_inheap) free (class_name);
free (key);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API void U(add_field_infos_to_sdb)(RBinJavaObj *bin) {
/*
*** Experimental and May Change ***
Add field information to an Array
the key for this info variable depenedent on addr, method ordinal, etc.
Key 1, mapping to method key:
java.<file_offset> = <field_key>
Key 3, method description
<field_key>.info = [<access str>, <class_name>, <name>, <signature>]
key 4, method meta
<field_key>.meta = [<file_offset>, ?]
*/
RListIter *iter = NULL, *iter_tmp=NULL;
RBinJavaField *fm_type;
ut32 key_size = 255,
value_buffer_size = 1024,
class_name_inheap = 1;
char * field_key = NULL,
* field_key_value = NULL,
* value_buffer = NULL;
char * class_name = r_bin_java_get_this_class_name (bin);
if (class_name == NULL) {
class_name = "unknown";
class_name_inheap = 0;
}
key_size += strlen(class_name);
value_buffer_size += strlen(class_name);
field_key = malloc (key_size);
value_buffer = malloc (value_buffer_size);
field_key_value = malloc(key_size);
snprintf (field_key, key_size, "%s.methods", class_name);
field_key[key_size-1] = 0;
r_list_foreach_safe (bin->fields_list, iter, iter_tmp, fm_type) {
2015-08-26 13:00:30 +00:00
char number_buffer[80];
ut64 file_offset = fm_type->file_offset + bin->loadaddr;
2015-08-26 13:00:30 +00:00
snprintf (number_buffer, sizeof (number_buffer), "0x%04"PFMT64x, file_offset);
IFDBG eprintf ("Inserting: []%s = %s\n", field_key, number_buffer);
sdb_array_push (bin->kv, field_key, number_buffer, 0);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
r_list_foreach_safe (bin->fields_list, iter, iter_tmp, fm_type) {
ut64 field_offset = fm_type->file_offset + bin->loadaddr;
// generate method specific key & value
snprintf (field_key, key_size, "%s.0x%04"PFMT64x, class_name, field_offset);
field_key[key_size-1] = 0;
snprintf (field_key_value, key_size, "%s.0x%04"PFMT64x".field", class_name, field_offset);
field_key_value[key_size-1] = 0;
sdb_set (bin->kv, field_key, field_key_value, 0);
IFDBG eprintf ("Inserting: %s = %s\n", field_key, field_key_value);
// generate info key, and place values in method info array
snprintf (field_key, key_size, "%s.info",field_key_value);
field_key[key_size-1] = 0;
snprintf (value_buffer, value_buffer_size, "%s", fm_type->flags_str);
value_buffer[value_buffer_size-1] = 0;
sdb_array_push (bin->kv, field_key, value_buffer, 0);
IFDBG eprintf ("Inserting: []%s = %s\n", field_key, value_buffer);
snprintf (value_buffer, value_buffer_size, "%s", fm_type->class_name);
value_buffer[value_buffer_size-1] = 0;
sdb_array_push (bin->kv, field_key, value_buffer, 0);
IFDBG eprintf ("Inserting: []%s = %s\n", field_key, value_buffer);
snprintf (value_buffer, value_buffer_size, "%s", fm_type->name);
value_buffer[value_buffer_size-1] = 0;
sdb_array_push (bin->kv, field_key, value_buffer, 0);
IFDBG eprintf ("Inserting: []%s = %s\n", field_key, value_buffer);
snprintf (value_buffer, value_buffer_size, "%s", fm_type->descriptor);
value_buffer[value_buffer_size-1] = 0;
sdb_array_push (bin->kv, field_key, value_buffer, 0);
IFDBG eprintf ("Inserting: []%s = %s\n", field_key, value_buffer);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
free (field_key);
free (field_key_value);
free (value_buffer);
if (class_name_inheap) free (class_name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
2014-05-12 02:06:40 +00:00
R_API void U(add_method_infos_to_sdb)(RBinJavaObj *bin) {
/*
*** Experimental and May Change ***
Add Mehtod information to an Array
the key for this info variable depenedent on addr, method ordinal, etc.
Key 1, mapping to method key:
java.<file_offset> = <method_key>
Key 2, basic code information
<method_key>.code = [<addr>, <size>]
Key 3, method description
<method_key>.info = [<access str>, <class_name>, <name>, <signature>,]
key 4, method meta
<method_key>.meta = [<file_offset>, ?]
// TODO in key 3 add <class_name>?
e.g. <access str>.<name>.<signature>
Note: method name not used because of collisions with operator overloading
also take note that code offset and the method offset are not the same
values.
*/
RListIter *iter = NULL, *iter_tmp=NULL;
RBinJavaField *fm_type;
ut32 key_size = 255,
value_buffer_size = 1024,
class_name_inheap = 1;
char * method_key = NULL,
* method_key_value = NULL,
* value_buffer = NULL;
char * class_name = r_bin_java_get_this_class_name (bin);
ut64 baddr = bin->loadaddr;
if (class_name == NULL) {
class_name = "unknown";
class_name_inheap = 0;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
key_size += strlen(class_name);
value_buffer_size += strlen (class_name);
method_key = malloc (key_size);
value_buffer = malloc (value_buffer_size);
method_key_value = malloc (key_size);
snprintf (method_key, key_size, "%s.methods", class_name);
method_key[key_size-1] = 0;
r_list_foreach_safe (bin->methods_list, iter, iter_tmp, fm_type) {
2015-08-26 13:00:30 +00:00
char number_buffer[80];
ut64 file_offset = fm_type->file_offset + baddr;
2015-08-26 13:00:30 +00:00
snprintf (number_buffer, sizeof (number_buffer), "0x%04"PFMT64x, file_offset);
sdb_array_push (bin->kv, method_key, number_buffer, 0);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
r_list_foreach_safe (bin->methods_list, iter, iter_tmp, fm_type) {
ut64 code_offset = r_bin_java_get_method_code_offset (fm_type) + baddr,
code_size = r_bin_java_get_method_code_size (fm_type),
method_offset = fm_type->file_offset + baddr;
// generate method specific key & value
snprintf (method_key, key_size, "%s.0x%04"PFMT64x, class_name, code_offset);
method_key[key_size-1] = 0;
snprintf (method_key_value, key_size, "%s.0x%04"PFMT64x".method", class_name, method_offset);
method_key_value[key_size-1] = 0;
IFDBG eprintf("Adding %s to sdb_array: %s\n", method_key_value, method_key);
sdb_set (bin->kv, method_key, method_key_value, 0);
// generate code key and values
snprintf (method_key, key_size, "%s.code",method_key_value);
method_key[key_size-1] = 0;
snprintf (value_buffer, value_buffer_size, "0x%04"PFMT64x, code_offset);
value_buffer[value_buffer_size-1] = 0;
sdb_array_push (bin->kv, method_key, value_buffer, 0);
snprintf (value_buffer, value_buffer_size, "0x%04"PFMT64x, code_size);
value_buffer[value_buffer_size-1] = 0;
sdb_array_push (bin->kv, method_key, value_buffer, 0);
// generate info key, and place values in method info array
snprintf (method_key, key_size, "%s.info", method_key_value);
method_key[key_size-1] = 0;
snprintf (value_buffer, value_buffer_size, "%s", fm_type->flags_str);
value_buffer[value_buffer_size-1] = 0;
IFDBG eprintf("Adding %s to sdb_array: %s\n", value_buffer, method_key);
sdb_array_push (bin->kv, method_key, value_buffer, 0);
snprintf (value_buffer, value_buffer_size, "%s", fm_type->class_name);
value_buffer[value_buffer_size-1] = 0;
IFDBG eprintf("Adding %s to sdb_array: %s\n", value_buffer, method_key);
sdb_array_push (bin->kv, method_key, value_buffer, 0);
snprintf (value_buffer, value_buffer_size, "%s", fm_type->name);
value_buffer[value_buffer_size-1] = 0;
IFDBG eprintf("Adding %s to sdb_array: %s\n", value_buffer, method_key);
sdb_array_push (bin->kv, method_key, value_buffer, 0);
snprintf (value_buffer, value_buffer_size, "%s", fm_type->descriptor);
value_buffer[value_buffer_size-1] = 0;
IFDBG eprintf("Adding %s to sdb_array: %s\n", value_buffer, method_key);
sdb_array_push (bin->kv, method_key, value_buffer, 0);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
free (method_key);
free (method_key_value);
free (value_buffer);
if (class_name_inheap) free (class_name);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RList * U(r_bin_java_get_args_from_bin) (RBinJavaObj *bin_obj, ut64 addr) {
RBinJavaField *fm_type = r_bin_java_get_method_code_attribute_with_addr (bin_obj, addr);
return fm_type ? r_bin_java_get_args (fm_type) : NULL;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RList * U(r_bin_java_get_ret_from_bin) (RBinJavaObj *bin_obj, ut64 addr) {
RBinJavaField *fm_type = r_bin_java_get_method_code_attribute_with_addr (bin_obj, addr);
return fm_type ? r_bin_java_get_ret (fm_type) : NULL;
}
R_API char * U(r_bin_java_get_fcn_name_from_bin)(RBinJavaObj *bin_obj, ut64 addr) {
RBinJavaField *fm_type = r_bin_java_get_method_code_attribute_with_addr (bin_obj, addr);
return fm_type && fm_type->name ? strdup (fm_type->name) : NULL;
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
R_API int U(r_bin_java_is_method_static)(RBinJavaObj *bin_obj, ut64 addr) {
RBinJavaField *fm_type = r_bin_java_get_method_code_attribute_with_addr (bin_obj, addr);
return fm_type && fm_type->flags & R_BIN_JAVA_METHOD_ACC_STATIC;
}
R_API int U(r_bin_java_is_method_private) (RBinJavaObj *bin_obj, ut64 addr) {
return r_bin_java_is_fm_type_private (r_bin_java_get_method_code_attribute_with_addr (bin_obj, addr));
}
R_API int U(r_bin_java_is_method_protected)(RBinJavaObj *bin_obj, ut64 addr) {
2014-05-12 02:06:40 +00:00
return r_bin_java_is_fm_type_protected (
r_bin_java_get_method_code_attribute_with_addr (bin_obj, addr));
}
R_API int r_bin_java_print_method_idx_summary(RBinJavaObj *bin_obj, ut32 idx) {
2015-09-14 00:08:31 +00:00
int res = false;
if (idx < r_list_length (bin_obj->methods_list)) {
RBinJavaField *fm_type = r_list_get_n (bin_obj->methods_list, idx);
r_bin_java_print_method_summary (fm_type);
2015-09-14 00:08:31 +00:00
res = true;
}
return res;
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API ut32 r_bin_java_get_method_count(RBinJavaObj *bin_obj) {
return r_list_length (bin_obj->methods_list);
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
R_API RList * r_bin_java_get_interface_names(RBinJavaObj * bin) {
RList *interfaces_names = r_list_new();
RListIter *iter;
RBinJavaInterfaceInfo *ifobj;
r_list_foreach(bin->interfaces_list, iter, ifobj) {
if (ifobj && ifobj->name) {
r_list_append (interfaces_names, strdup (ifobj->name));
}
Squashed commit of the following: commit 109915c7812305b9a442d3a0febd9bc43f7104b5 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:50:08 2013 -0500 - Added author rewrite tag commit 5fe0d07f3a318f871bc5d6a8499afd9ceab26e33 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 09:37:57 2013 -0500 - Added a print statement for the number of attributes in the Code Attribute - Added a default stack frame creation commit 4b1bca0d79c53421c1d7a9c59da070a5463ba05b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Sep 4 08:58:55 2013 -0500 - Added the R_API prefix to all function declarations and definitions - Removed the offset<=size from loops. Not sure why this check is failing, but it needs to be added in the future (probably add it to the list of defects.) - Code appears to parse the classfile correctly commit 5f5a28302da8c605800946df739c67a0f4f80b0d Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 23:11:00 2013 -0500 - still minor bug in the parsing code on the Type Verification or somewhere in the StackMapAttr. The right number of bytes are being read, but not all the bytes are being consumed commit 1c9d8b490c8d7d8592f898e019aed3b56f9406c8 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:59:08 2013 -0500 - fixed some compiler warnings in class.c commit c185248aa478c6c78f6dbe14cf65ee3396287302 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 20:58:21 2013 -0500 - Propogated the change to code.c from changes from classes. commit 927542a0672f37b41b23345533bc7e6f2d1a5369 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 17:10:40 2013 -0500 Fixed some minor parsing bugs: code_attr offet was not updated correctly after reading the length of the attribute attr_buf was not initialized correctly before use commit b43a7189e9934369d1fdbd96de020edcab907430 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Tue Sep 3 16:33:36 2013 -0500 - Code compiles. Time to test. commit ea7b332d84b88baca1abc466d02b00b2b8739bca Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 23:55:44 2013 -0500 - Added in size calculations for the CP Objects. - Need to add method or field references calculations for size after compiling commit ba55375dc0e835fb46550d0063758e419ec0ed7b Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Mon Sep 2 22:56:56 2013 -0500 - Revamped all of the attribute parsing. The parsers will handle buffers rather than simply parsing straight from the file. - added a size calculator for each of the attributes, which opens up the way for creating writers for the attributes and such. commit be6f2e038f01beeb56ace7d4daaf4d90ad3fdad7 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Sat Aug 31 12:19:18 2013 -0500 - Cleaned up code and removed some of the compiler warnings. commit 4c81812f2609e4a80c7036053d122306039dd6ef Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 15:24:15 2013 -0500 - Compiler and linker errors have been resolved. - Need to work on testing commit 429ed30621d9abff1eec99ef50a35c57bbed76ad Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 13:35:39 2013 -0500 Added the RunTime Annotations and Parameter annotations. Time to start compiling and testing. commit b6044e1c74cc10874902bd34da7c8fcbdb5713cc Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 12:34:14 2013 -0500 Added BootstrapMethodsAttr Parsing code along with supporting stuff, like creating the method and argument structures and mapping the REF_types to strings More should be done to map the REF_types to specific resolutions. Added in the MethodType, MethodHandle, and InvokeDynamic ConstantPool Objects commit 2c9317be5d2be0608131fb9aa10f713885c89471 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 30 00:21:34 2013 -0500 Finished drafting the code for annotation, element values, element value pairs, and annotation default attribute. TODO: RTI, RTV, and then Bootstrap attributes. commit cbee3a10c18342f6a8fb941245568de885fe5666 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:42:00 2013 -0500 Fixed the r_bin_java_element_value_new function definition. commit ab98a76fabf2bd7764a51f3363d821c5a4cf1200 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 15:39:28 2013 -0500 - worked out some of the initial compile errors. - worked out an outline for parsing the element_values - need to work through parsing the element value, freeing the element value, and then printing a summary. commit b543d904f2aebd0d1f9c0ac8ec8401b6ab698f36 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 29 08:21:33 2013 -0500 Most of the heavy lifting is done for attributes. Need to implement a few of the methods, and then compiling should be able to happen. Added in all attribute values to the enums, the function call tables, and then the Metas information. Need implement an ElementValue parser bleh. Need to implement RuntimeAnnotations, Annotations, ElementValue parsing and make sure that the attribute unions are all updated. commit 81f9ca2da2ed7e007a97a20ecb8eb260dfd55e7e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 22:33:43 2013 -0500 Finished adding some logic to handle the StackMapFrame types. commit 9a0965cc06021ad56d2127d279b918eef613bec9 Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Wed Aug 28 17:54:52 2013 -0500 Got some of the StackMapTable Atrribute parsing working. Right now, only the FullStackFrame will correctly parse. commit ea12bd6a8ae9969fa05cbcab622651c8b426917a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:51:33 2013 -0500 Added some debugging code while trying to figure out how to parse the StackMapTable. commit 6141b57ee94c7bd0569d0ea76725fdce1ac50edf Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 17:00:12 2013 -0500 Code compiles. commit a7ad14050eb6184a1171620c4dcdba71b2f791aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:29:17 2013 -0500 - Added a basic Signature element - Added declarations for the new functions to handle the parsing of the StackMapTable related structures. commit 54cca3d9af60463dbfa77e23ef1d562ae82d6e5a Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Fri Aug 23 10:18:50 2013 -0500 Finished an initial coding implementation of the StackMapTable. -- Will perform testing later in the day. -- Need to look-up the Signature Attribute commit a14238eece865f4d1c5f2d6b1f482b000d10d94e Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 20:23:45 2013 -0500 StackMap stuff is wip. commit f011a5d948d31cc6197eed1bbea497a4dde362aa Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 18:44:23 2013 -0500 Made the globals match the R_* standard. Also tried to clean up naming stuff. commit 6e61e15572744c2ed722ac3df8d988cc02f1316c Author: Adam Pridgen <adam.pridgen@thecoverofnight.com> Date: Thu Aug 22 16:40:08 2013 -0500 Plugging progress into the repo. Adding fixes to handle the Java Class file appropriately. This modification is mostly a re-write of the Class File parser, and it "tries" to do a better job of creating better objects for each of the Classfile elements. Currently this code is experimental, and current TODOs are: 1) Testing 2) StackMapTable 3) LocalVariableTypeTable
2013-09-04 15:04:36 +00:00
}
return interfaces_names;
}
R_API ut64 r_bin_java_get_main(RBinJavaObj* bin) {
if (bin->main_code_attr) {
return bin->main_code_attr->info.code_attr.code_offset + bin->loadaddr;
}
return 0;
}
R_API RBinJavaObj* r_bin_java_new (const char* file, ut64 loadaddr, Sdb * kv) {
ut8 *buf;
RBinJavaObj *bin = R_NEW0 (RBinJavaObj);
bin->file = strdup (file);
if (!(buf = (ut8*)r_file_slurp (file, &bin->size)))
return r_bin_java_free (bin);
if (!r_bin_java_new_bin (bin, loadaddr, kv, buf, bin->size)) {
r_bin_java_free (bin);
bin = NULL;
}
free (buf);
return bin;
}
R_API ut64 r_bin_java_get_class_entrypoint(RBinJavaObj* bin) {
if (bin->cf2.this_class_entrypoint_code_attr) {
return bin->cf2.this_class_entrypoint_code_attr->info.code_attr.code_offset;
}
return 0;
}
R_API RList * r_bin_java_get_method_exception_table_with_addr(RBinJavaObj *bin, ut64 addr) {
RListIter *iter = NULL, *iter_tmp=NULL;
RBinJavaField *fm_type, *res = NULL;
if (!bin && R_BIN_JAVA_GLOBAL_BIN) bin = R_BIN_JAVA_GLOBAL_BIN;
if (!bin) {
eprintf ("Attempting to analyse function when the R_BIN_JAVA_GLOBAL_BIN has not been set.\n");
return NULL;
}
r_list_foreach_safe (bin->methods_list, iter, iter_tmp, fm_type) {
ut64 offset = r_bin_java_get_method_code_offset(fm_type) + bin->loadaddr,
size = r_bin_java_get_method_code_size(fm_type);
if (addr >= offset && addr <= size + offset)
res = fm_type;
}
if (res) {
RBinJavaAttrInfo *code_attr = r_bin_java_get_method_code_attribute (res);
return code_attr->info.code_attr.exception_table;
}
return NULL;
}
R_API const RList* r_bin_java_get_methods_list(RBinJavaObj* bin) {
if (bin) return bin->methods_list;
if (R_BIN_JAVA_GLOBAL_BIN)
return R_BIN_JAVA_GLOBAL_BIN->methods_list;
return NULL;
}
R_API RList* r_bin_java_get_bin_obj_list_thru_obj(RBinJavaObj *bin_obj) {
RList *the_list;
Sdb * sdb;
if (!bin_obj) return NULL;
sdb = bin_obj->AllJavaBinObjs;
if (!sdb) return NULL;
the_list = r_list_new();
if (!the_list) return NULL;
sdb_foreach (sdb, sdb_iterate_build_list, (void *) the_list);
return the_list;
}
R_API RList * r_bin_java_extract_all_bin_type_values(RBinJavaObj * bin_obj) {
RListIter *fm_type_iter;
RList *all_types = r_list_new ();
RBinJavaField *fm_type;
// get all field types
r_list_foreach (bin_obj->fields_list, fm_type_iter, fm_type) {
char *desc = NULL;
if (!extract_type_value (fm_type->descriptor, &desc))
return NULL;
IFDBG eprintf ("Adding field type: %s\n", desc);
r_list_append (all_types, desc);
}
// get all method types
r_list_foreach (bin_obj->methods_list, fm_type_iter, fm_type) {
RList * the_list = r_bin_java_extract_type_values (fm_type->descriptor);
RListIter *desc_iter;
char *str;
r_list_foreach (the_list, desc_iter, str) {
if (str && *str != '(' && *str != ')') {
r_list_append (all_types, strdup(str));
IFDBG eprintf ("Adding method type: %s\n", str);
}
}
r_list_free (the_list);
}
return all_types;
}
R_API RList * r_bin_java_get_method_definitions(RBinJavaObj *bin) {
RBinJavaField *fm_type = NULL;
RList *the_list = r_list_new ();
RListIter *iter = NULL;
if (!bin) return the_list;
r_list_foreach (bin->methods_list, iter, fm_type) {
char *method_proto = r_bin_java_get_method_definition (fm_type);
//eprintf ("Method prototype: %s\n", method_proto);
r_list_append(the_list, method_proto);
}
return the_list;
}
R_API RList * r_bin_java_get_field_definitions(RBinJavaObj *bin) {
RBinJavaField *fm_type = NULL;
RList *the_list = r_list_new ();
RListIter *iter = NULL;
if (!bin) return the_list;
r_list_foreach (bin->fields_list, iter, fm_type) {
char *field_def = r_bin_java_get_field_definition (fm_type);
//eprintf ("Field def: %s, %s, %s, %s\n", fm_type->name, fm_type->descriptor, fm_type->flags_str, field_def);
r_list_append(the_list, field_def);
}
return the_list;
}
R_API RList * r_bin_java_get_import_definitions(RBinJavaObj *bin) {
RList *the_list = r_bin_java_get_lib_names (bin);
RListIter *iter = NULL;
char *new_str;
if (!bin || !the_list) return the_list;
r_list_foreach (the_list, iter, new_str) {
while (*new_str) {
if (*new_str == '/') *new_str = '.';
new_str ++;
}
}
return the_list;
}
2014-05-12 08:16:15 +00:00
R_API RList * r_bin_java_get_field_offsets(RBinJavaObj *bin) {
RBinJavaField *fm_type = NULL;
RList *the_list = r_list_new ();
RListIter *iter = NULL;
ut64 *paddr = NULL;
if (!bin) return the_list;
the_list->free = free;
r_list_foreach (bin->fields_list, iter, fm_type) {
paddr = malloc (sizeof(ut64));
*paddr = fm_type->file_offset + bin->loadaddr;
//eprintf ("Field def: %s, %s, %s, %s\n", fm_type->name, fm_type->descriptor, fm_type->flags_str, field_def);
r_list_append(the_list, paddr);
}
return the_list;
}
2014-05-12 08:16:15 +00:00
R_API RList * r_bin_java_get_method_offsets(RBinJavaObj *bin) {
RBinJavaField *fm_type = NULL;
RList *the_list = r_list_new ();
RListIter *iter = NULL;
ut64 *paddr = NULL;
if (!bin) return the_list;
the_list->free = free;
r_list_foreach (bin->methods_list, iter, fm_type) {
paddr = malloc (sizeof(ut64));
*paddr = fm_type->file_offset + bin->loadaddr;
r_list_append(the_list, paddr);
}
return the_list;
}
R_API ut16 r_bin_java_calculate_field_access_value(const char * access_flags_str) {
return calculate_access_value (access_flags_str, FIELD_ACCESS_FLAGS);
}
R_API ut16 r_bin_java_calculate_class_access_value(const char * access_flags_str) {
return calculate_access_value (access_flags_str, CLASS_ACCESS_FLAGS);
}
R_API ut16 r_bin_java_calculate_method_access_value(const char * access_flags_str) {
return calculate_access_value (access_flags_str, METHOD_ACCESS_FLAGS);
}
2014-05-12 08:16:15 +00:00
R_API RList * retrieve_all_method_access_string_and_value() {
return retrieve_all_access_string_and_value (METHOD_ACCESS_FLAGS);
}
2014-05-12 08:16:15 +00:00
R_API RList * retrieve_all_field_access_string_and_value() {
return retrieve_all_access_string_and_value (FIELD_ACCESS_FLAGS);
}
2014-05-12 08:16:15 +00:00
R_API RList * retrieve_all_class_access_string_and_value() {
return retrieve_all_access_string_and_value (CLASS_ACCESS_FLAGS);
}
2014-05-12 08:16:15 +00:00
R_API char * r_bin_java_resolve_with_space(RBinJavaObj *obj, int idx) {
return r_bin_java_resolve(obj, idx, 1);
}
2014-05-12 08:16:15 +00:00
R_API char * r_bin_java_resolve_without_space(RBinJavaObj *obj, int idx) {
return r_bin_java_resolve(obj, idx, 0);
2013-09-14 12:04:08 +00:00
}
2014-05-12 08:16:15 +00:00
R_API char * r_bin_java_resolve_b64_encode(RBinJavaObj *BIN_OBJ, ut16 idx) {
RBinJavaCPTypeObj *item = NULL, *item2 = NULL;
char *class_str = NULL,
*name_str = NULL,
*desc_str = NULL,
*string_str = NULL,
*empty = "",
*cp_name = NULL,
*str = NULL, *out = NULL;
2014-05-12 02:06:40 +00:00
int memory_alloc = 0;
if (BIN_OBJ && BIN_OBJ->cp_count < 1) {
//r_bin_java_new_bin(BIN_OBJ);
return NULL;
}
item = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
if (item) {
cp_name = ((RBinJavaCPTypeMetas *) item->metas->type_info)->name;
IFDBG eprintf("java_resolve Resolved: (%d) %s\n", idx, cp_name);
} else {
return NULL;
}
cp_name = ((RBinJavaCPTypeMetas *) item->metas->type_info)->name;
if (!strcmp (cp_name, "Class")) {
item2 = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
//str = r_bin_java_get_name_from_bin_cp_list (BIN_OBJ, idx-1);
class_str = empty;
class_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!class_str)
class_str = empty;
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item2);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item2);
if (!desc_str)
desc_str = empty;
memory_alloc = strlen (class_str) + strlen (name_str) + strlen (desc_str) + 3;
if (memory_alloc) {
str = malloc (memory_alloc);
snprintf (str, memory_alloc, "%s%s", name_str, desc_str);
2015-02-09 23:05:18 +00:00
out = (char*)malloc(memory_alloc);
memset (out, 0, memory_alloc);
2015-02-09 23:05:18 +00:00
r_base64_encode (out, (const ut8 *)str, strlen(str));
free (str);
str = out;
}
if (class_str != empty)
free (class_str);
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
}else if (strcmp (cp_name, "MethodRef") == 0 ||
strcmp (cp_name, "FieldRef") == 0 ||
strcmp (cp_name, "InterfaceMethodRef") == 0) {
/*
* The MethodRef, FieldRef, and InterfaceMethodRef structures
*/
class_str = r_bin_java_get_name_from_bin_cp_list (BIN_OBJ, item->info.cp_method.class_idx);
if (!class_str)
class_str = empty;
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item);
if (!desc_str)
desc_str = empty;
memory_alloc = strlen (class_str) + strlen (name_str) + strlen (desc_str) + 3;
if (memory_alloc) {
str = malloc (memory_alloc);
snprintf (str, memory_alloc, "%s/%s%s", class_str, name_str, desc_str);
out = malloc(memory_alloc);
memset (out, 0, memory_alloc);
2015-02-09 23:05:18 +00:00
r_base64_encode (out, (const ut8 *)str, strlen(str));
free (str);
str = out;
}
if (class_str != empty)
free (class_str);
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
} else if (strcmp (cp_name, "String") == 0) {
ut32 length = r_bin_java_get_utf8_len_from_bin_cp_list (BIN_OBJ, item->info.cp_string.string_idx);
string_str = r_bin_java_get_utf8_from_bin_cp_list (BIN_OBJ, item->info.cp_string.string_idx);
str = NULL;
IFDBG eprintf("java_resolve String got: (%d) %s\n", item->info.cp_string.string_idx, string_str);
if (!string_str) {
string_str = empty;
length = strlen (empty);
}
memory_alloc = length + 3;
if (memory_alloc) {
str = malloc (memory_alloc);
snprintf (str, memory_alloc, "\"%s\"", string_str);
out = malloc(memory_alloc);
memset (out, 0, memory_alloc);
2015-02-09 23:05:18 +00:00
r_base64_encode (out, (const ut8 *)str, strlen(str));
free (str);
str = out;
}
IFDBG eprintf("java_resolve String return: %s\n", str);
if (string_str != empty)
free (string_str);
} else if (strcmp (cp_name, "Utf8") == 0) {
ut64 sz = item->info.cp_utf8.length ? item->info.cp_utf8.length + 10: 10;
str = malloc(sz);
memset (str, 0, sz);
if (sz > 10)
2015-02-09 23:05:18 +00:00
r_base64_encode (str, item->info.cp_utf8.bytes, item->info.cp_utf8.length);
} else if (strcmp (cp_name, "Long") == 0) {
str = malloc (34);
out = malloc (34);
memset (out, 0, 34);
if (str) {
snprintf (str, 34, "0x%llx", r_bin_java_raw_to_long (item->info.cp_long.bytes.raw,0));
2015-02-09 23:05:18 +00:00
r_base64_encode (out, (const ut8 *)str, strlen(str));
free (str);
str = out;
}
} else if (strcmp (cp_name, "Double") == 0) {
str = malloc (1000);
out = malloc (1000);
memset (out, 0, 1000);
if (str) {
snprintf (str, 1000, "%f", r_bin_java_raw_to_double (item->info.cp_double.bytes.raw,0));
2015-02-09 23:05:18 +00:00
r_base64_encode (out, (const ut8 *)str, strlen(str));
free (str);
str = out;
}
} else if (strcmp (cp_name, "Integer") == 0) {
str = calloc (34, 1);
out = calloc (34, 1);
if (str) {
snprintf (str, 34, "0x%08x", R_BIN_JAVA_UINT (item->info.cp_integer.bytes.raw, 0));
r_base64_encode (out, (const ut8 *)str, strlen (str));
free (str);
str = out;
}
} else if (strcmp (cp_name, "Float") == 0) {
str = malloc (34);
out = malloc (34);
memset (out, 0, 34);
if (str) {
snprintf (str, 34, "%f", R_BIN_JAVA_FLOAT (item->info.cp_float.bytes.raw,0));
2015-02-09 23:05:18 +00:00
r_base64_encode (out, (const ut8 *)str, strlen(str));
free (str);
str = out;
}
} else if (!strcmp (cp_name, "NameAndType")) {
2014-02-19 21:09:16 +00:00
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item);
if (!desc_str)
desc_str = empty;
memory_alloc = strlen (name_str) + strlen (desc_str) + 3;
if (memory_alloc) {
2014-02-19 21:09:16 +00:00
str = malloc (memory_alloc);
snprintf (str, memory_alloc, "%s %s", name_str, desc_str);
out = malloc (memory_alloc);
memset (out, 0, memory_alloc);
2015-02-09 23:05:18 +00:00
r_base64_encode (out, (const ut8 *)str, strlen(str));
free (str);
str = out;
}
2014-02-19 21:09:16 +00:00
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
} else {
str = malloc (16);
memset (str, 0, 16);
if (str) {
2015-02-09 23:05:18 +00:00
r_base64_encode (str, (const ut8*)"(null)", 6);
}
}
return str;
}
2014-05-12 08:16:15 +00:00
R_API ut64 r_bin_java_resolve_cp_idx_address(RBinJavaObj *BIN_OBJ, int idx) {
RBinJavaCPTypeObj *item = NULL;
ut64 addr = -1;
if (BIN_OBJ && BIN_OBJ->cp_count < 1) {
return -1;
}
item = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
if (item)
addr = item->file_offset + item->loadaddr;
return addr;
}
2014-05-12 08:16:15 +00:00
R_API char * r_bin_java_resolve_cp_idx_to_string(RBinJavaObj *BIN_OBJ, int idx) {
RBinJavaCPTypeObj *item = NULL;
char *value = NULL;
if (BIN_OBJ && BIN_OBJ->cp_count < 1) {
return NULL;
}
item = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
if (item) {
value = ((RBinJavaCPTypeMetas *)
item->metas->type_info)->
allocs->stringify_obj (item);
}
return value;
}
2014-05-12 08:16:15 +00:00
R_API int r_bin_java_resolve_cp_idx_print_summary(RBinJavaObj *BIN_OBJ, int idx) {
RBinJavaCPTypeObj *item = NULL;
if (BIN_OBJ && BIN_OBJ->cp_count < 1) {
2015-09-14 00:08:31 +00:00
return false;
}
item = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
if (item) {
((RBinJavaCPTypeMetas *)
item->metas->type_info)->
allocs->print_summary (item);
} else {
eprintf ("Error: Invalid CP Object.\n");
}
2015-09-14 00:08:31 +00:00
return item ? true: false;
}
2014-05-12 02:06:40 +00:00
R_API ConstJavaValue * U(r_bin_java_resolve_to_const_value)(RBinJavaObj *BIN_OBJ, int idx) {
// TODO XXX FIXME add a size parameter to the str when it is passed in
RBinJavaCPTypeObj *item = NULL, *item2 = NULL;
ConstJavaValue *result = R_NEW0 (ConstJavaValue);
char *class_str = NULL,
*name_str = NULL,
*desc_str = NULL,
*string_str = NULL,
*empty = "",
*cp_name = NULL;
result->type = "unknown";
if (BIN_OBJ && BIN_OBJ->cp_count < 1) {
//r_bin_java_new_bin(BIN_OBJ);
return result;
}
item = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
if (item) {
cp_name = ((RBinJavaCPTypeMetas *) item->metas->type_info)->name;
IFDBG eprintf("java_resolve Resolved: (%d) %s\n", idx, cp_name);
} else {
return result;
}
cp_name = ((RBinJavaCPTypeMetas *) item->metas->type_info)->name;
if (strcmp (cp_name, "Class") == 0) {
item2 = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
//str = r_bin_java_get_name_from_bin_cp_list (BIN_OBJ, idx-1);
class_str = empty;
class_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!class_str)
class_str = empty;
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item2);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item2);
if (!desc_str)
desc_str = empty;
result->value._ref = R_NEW0 (_JavaRef);
result->type = "ref";
result->value._ref->class_name = strdup(class_str);
result->value._ref->name = strdup(name_str);
result->value._ref->desc = strdup(desc_str);
if (class_str != empty)
free (class_str);
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
}else if (strcmp (cp_name, "MethodRef") == 0 ||
strcmp (cp_name, "FieldRef") == 0 ||
strcmp (cp_name, "InterfaceMethodRef") == 0) {
/*
* The MethodRef, FieldRef, and InterfaceMethodRef structures
*/
class_str = r_bin_java_get_name_from_bin_cp_list (BIN_OBJ, item->info.cp_method.class_idx);
if (!class_str)
class_str = empty;
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item);
if (!desc_str)
desc_str = empty;
result->value._ref = R_NEW0 (_JavaRef);
result->type = "ref";
result->value._ref->class_name = strdup(class_str);
result->value._ref->name = strdup(name_str);
result->value._ref->desc = strdup(desc_str);
if (class_str != empty)
free (class_str);
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
} else if (strcmp (cp_name, "String") == 0) {
ut32 length = r_bin_java_get_utf8_len_from_bin_cp_list (BIN_OBJ, item->info.cp_string.string_idx);
string_str = r_bin_java_get_utf8_from_bin_cp_list (BIN_OBJ, item->info.cp_string.string_idx);
IFDBG eprintf("java_resolve String got: (%d) %s\n", item->info.cp_string.string_idx, string_str);
if (!string_str) {
string_str = empty;
length = strlen (empty);
}
result->type = "str";
result->value._str = R_NEW0 (struct java_const_value_str_t);
result->value._str->str = malloc (length);
result->value._str->len = length;
memcpy (result->value._str->str, string_str, length);
if (string_str != empty)
free (string_str);
} else if (strcmp (cp_name, "Utf8") == 0) {
result->type = "str";
result->value._str = R_NEW0 (struct java_const_value_str_t);
result->value._str->str = malloc (item->info.cp_utf8.length);
result->value._str->len = item->info.cp_utf8.length;
memcpy (result->value._str->str, item->info.cp_utf8.bytes, item->info.cp_utf8.length);
} else if (strcmp (cp_name, "Long") == 0) {
result->type = "long";
result->value._long = r_bin_java_raw_to_long (item->info.cp_long.bytes.raw,0);
} else if (strcmp (cp_name, "Double") == 0) {
result->type = "double";
result->value._double = r_bin_java_raw_to_double (item->info.cp_double.bytes.raw,0);
} else if (strcmp (cp_name, "Integer") == 0) {
result->type = "int";
result->value._int = R_BIN_JAVA_UINT (item->info.cp_integer.bytes.raw,0);
} else if (strcmp (cp_name, "Float") == 0) {
result->type = "float";
result->value._float = R_BIN_JAVA_FLOAT (item->info.cp_float.bytes.raw,0);
} else if (strcmp (cp_name, "NameAndType") == 0) {
result->value._ref = R_NEW0 (struct java_const_value_ref_t);
result->type = "ref";
name_str = r_bin_java_get_item_name_from_bin_cp_list (BIN_OBJ, item);
if (!name_str)
name_str = empty;
desc_str = r_bin_java_get_item_desc_from_bin_cp_list (BIN_OBJ, item);
if (!desc_str)
desc_str = empty;
result->value._ref->class_name = strdup(empty);
result->value._ref->name = strdup(name_str);
result->value._ref->desc = strdup(desc_str);
if (name_str != empty)
free (name_str);
if (desc_str != empty)
free (desc_str);
result->value._ref->is_method = r_bin_java_does_cp_idx_ref_method (BIN_OBJ, idx);
result->value._ref->is_field = r_bin_java_does_cp_idx_ref_field (BIN_OBJ, idx);
}
return result;
}
2014-05-12 02:06:40 +00:00
R_API void U(r_bin_java_free_const_value)(ConstJavaValue * cp_value) {
char first_char = cp_value && cp_value->type ? *cp_value->type : 0,
second_char = cp_value && cp_value->type ? *(cp_value->type+1) : 0;
switch (first_char) {
case 'r':
if (cp_value && cp_value->value._ref) {
free (cp_value->value._ref->class_name);
free (cp_value->value._ref->name);
free (cp_value->value._ref->desc);
}
break;
case 's':
if (second_char == 't' && cp_value->value._str) {
free (cp_value->value._str->str);
}
break;
}
free (cp_value);
}
R_API char * r_bin_java_get_field_name (RBinJavaObj *bin_obj, ut32 idx) {
char *name = NULL;
if (idx < r_list_length (bin_obj->fields_list)) {
RBinJavaField *fm_type = r_list_get_n (bin_obj->fields_list, idx);
name = strdup (fm_type->name);
}
return name;
}
2014-05-12 08:16:15 +00:00
R_API int r_bin_java_print_field_idx_summary (RBinJavaObj *bin_obj, ut32 idx) {
2015-09-14 00:08:31 +00:00
int res = false;
if (idx < r_list_length (bin_obj->fields_list)) {
RBinJavaField *fm_type = r_list_get_n (bin_obj->fields_list, idx);
r_bin_java_print_field_summary (fm_type);
2015-09-14 00:08:31 +00:00
res = true;
}
return res;
}
R_API ut32 r_bin_java_get_field_count (RBinJavaObj *bin_obj) {
return r_list_length (bin_obj->fields_list);
}
R_API RList * r_bin_java_get_field_num_name (RBinJavaObj *bin_obj) {
ut32 i = 0;
RBinJavaField *fm_type;
RListIter *iter = NULL;
RList *res = r_list_newf (free);
r_list_foreach (bin_obj->fields_list, iter, fm_type) {
ut32 len = strlen (fm_type->name) + 30;
char *str = malloc (len);
snprintf (str, len, "%d %s", i, fm_type->name);
++i;
r_list_append (res, str);
}
return res;
}
2014-06-25 02:11:43 +00:00
R_API RList * r_bin_java_find_cp_const_by_val_utf8 (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len) {
RList * res = r_list_newf (free);
ut32 *v = NULL;
RListIter *iter;
RBinJavaCPTypeObj *cp_obj;
IFDBG eprintf ("In UTF-8 Looking for %s\n", bytes);
r_list_foreach (bin_obj->cp_list, iter, cp_obj) {
if (cp_obj->tag == R_BIN_JAVA_CP_UTF8) {
IFDBG eprintf ("In UTF-8 Looking @ %s\n", cp_obj->info.cp_utf8.bytes);
IFDBG eprintf ("UTF-8 len = %d and memcmp = %d\n", cp_obj->info.cp_utf8.length, memcmp (bytes, cp_obj->info.cp_utf8.bytes, len));
if (len == cp_obj->info.cp_utf8.length && !memcmp (bytes, cp_obj->info.cp_utf8.bytes, len)) {
v = malloc (sizeof (ut32));
*v = cp_obj->metas->ord;
IFDBG eprintf ("Found a match adding idx: %d\n", *v);
r_list_append (res, v);
}
}
}
return res;
}
2014-06-25 02:11:43 +00:00
R_API RList * r_bin_java_find_cp_const_by_val_int (RBinJavaObj *bin_obj, const ut8 *bytes, ut32 len) {
RList * res = r_list_newf (free);
ut32 *v = NULL;
RListIter *iter;
RBinJavaCPTypeObj *cp_obj;
eprintf ("Looking for 0x%08x\n", (ut32)R_BIN_JAVA_UINT (bytes, 0));
r_list_foreach (bin_obj->cp_list, iter, cp_obj) {
if (cp_obj->tag == R_BIN_JAVA_CP_INTEGER) {
if (len == 4 && R_BIN_JAVA_UINT (bytes, 0) == R_BIN_JAVA_UINT (cp_obj->info.cp_integer.bytes.raw, 0)) {
v = malloc (sizeof (ut32));
*v = cp_obj->idx;
r_list_append (res, v);
}
}
}
return res;
}
2014-05-12 08:16:15 +00:00
R_API char r_bin_java_resolve_cp_idx_tag(RBinJavaObj *BIN_OBJ, int idx) {
RBinJavaCPTypeObj *item = NULL;
if (BIN_OBJ && BIN_OBJ->cp_count < 1) {
//r_bin_java_new_bin(BIN_OBJ);
return R_BIN_JAVA_CP_UNKNOWN;
}
item = (RBinJavaCPTypeObj *) r_bin_java_get_item_from_bin_cp_list (BIN_OBJ, idx);
if (item) {
return item->tag;
}
return R_BIN_JAVA_CP_UNKNOWN;
}
2014-05-12 02:06:40 +00:00
R_API int U(r_bin_java_integer_cp_set)(RBinJavaObj *bin, ut16 idx, ut32 val) {
RBinJavaCPTypeObj* cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, idx);
ut8 bytes[4] = {0};
if (cp_obj->tag != R_BIN_JAVA_CP_INTEGER && cp_obj->tag != R_BIN_JAVA_CP_FLOAT) {
eprintf ("Not supporting the overwrite of CP Objects with one of a different size.\n");
2015-09-14 00:08:31 +00:00
return false;
}
r_bin_java_check_reset_cp_obj(cp_obj, R_BIN_JAVA_CP_INTEGER);
cp_obj->tag = R_BIN_JAVA_CP_INTEGER;
memcpy (bytes, (const char *) &val, 4);
val = R_BIN_JAVA_UINT (bytes, 0);
memcpy (&cp_obj->info.cp_integer.bytes.raw, (const char *) &val, 4);
2015-09-14 00:08:31 +00:00
return true;
}
R_API int U(r_bin_java_float_cp_set)(RBinJavaObj *bin, ut16 idx, float val) {
RBinJavaCPTypeObj* cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, idx);
ut8 bytes[4] = {0};
if (cp_obj->tag != R_BIN_JAVA_CP_INTEGER && cp_obj->tag != R_BIN_JAVA_CP_FLOAT) {
eprintf ("Not supporting the overwrite of CP Objects with one of a different size.\n");
2015-09-14 00:08:31 +00:00
return false;
}
r_bin_java_check_reset_cp_obj(cp_obj, R_BIN_JAVA_CP_FLOAT);
cp_obj->tag = R_BIN_JAVA_CP_FLOAT;
memcpy (bytes, (const char *) &val, 4);
val = R_BIN_JAVA_UINT (bytes, 0);
memcpy (&cp_obj->info.cp_float.bytes.raw, (const char *) &val, 4);
2015-09-14 00:08:31 +00:00
return true;
}
2014-05-12 02:06:40 +00:00
R_API int U(r_bin_java_long_cp_set)(RBinJavaObj *bin, ut16 idx, ut64 val) {
RBinJavaCPTypeObj* cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, idx);
ut8 bytes[8] = {0};
if (cp_obj->tag != R_BIN_JAVA_CP_LONG && cp_obj->tag != R_BIN_JAVA_CP_DOUBLE) {
eprintf ("Not supporting the overwrite of CP Objects with one of a different size.\n");
2015-09-14 00:08:31 +00:00
return false;
}
r_bin_java_check_reset_cp_obj(cp_obj, R_BIN_JAVA_CP_LONG);
cp_obj->tag = R_BIN_JAVA_CP_LONG;
memcpy (bytes, (const char *) &val, 8);
val = r_bin_java_raw_to_long (bytes, 0);
memcpy (&cp_obj->info.cp_long.bytes.raw, (const char *) &val, 8);
2015-09-14 00:08:31 +00:00
return true;
}
R_API int U(r_bin_java_double_cp_set)(RBinJavaObj *bin, ut16 idx, ut32 val) {
RBinJavaCPTypeObj* cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, idx);
ut8 bytes[8] = {0};
if (cp_obj->tag != R_BIN_JAVA_CP_LONG && cp_obj->tag != R_BIN_JAVA_CP_DOUBLE) {
eprintf ("Not supporting the overwrite of CP Objects with one of a different size.\n");
2015-09-14 00:08:31 +00:00
return false;
}
r_bin_java_check_reset_cp_obj(cp_obj, R_BIN_JAVA_CP_DOUBLE);
cp_obj->tag = R_BIN_JAVA_CP_DOUBLE;
memcpy (bytes, (const char *) &val, 8);
val = r_bin_java_raw_to_long (bytes, 0);
memcpy (&cp_obj->info.cp_double.bytes.raw, (const char *) &val, 8);
2015-09-14 00:08:31 +00:00
return true;
}
R_API int U(r_bin_java_utf8_cp_set)(RBinJavaObj *bin, ut16 idx, const ut8* buffer, ut32 len) {
RBinJavaCPTypeObj* cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, idx);
eprintf ("Writing %d bytes (%s)\n", len, buffer);
//r_bin_java_check_reset_cp_obj(cp_obj, R_BIN_JAVA_CP_INTEGER);
if (cp_obj->tag != R_BIN_JAVA_CP_UTF8) {
eprintf ("Not supporting the overwrite of CP Objects with one of a different size.\n");
2015-09-14 00:08:31 +00:00
return false;
}
if (cp_obj->info.cp_utf8.length != len) {
eprintf ("Not supporting the resize, rewriting utf8 string up to %d bytes.\n", cp_obj->info.cp_utf8.length);
if (cp_obj->info.cp_utf8.length > len) {
eprintf ("Remaining %d bytes will be filled with \\x00.\n", cp_obj->info.cp_utf8.length - len);
}
}
memcpy (cp_obj->info.cp_utf8.bytes, buffer, cp_obj->info.cp_utf8.length);
if (cp_obj->info.cp_utf8.length > len) {
memset (cp_obj->info.cp_utf8.bytes+len, 0, cp_obj->info.cp_utf8.length-len);
}
2015-09-14 00:08:31 +00:00
return true;
}
R_API ut8 * r_bin_java_cp_get_bytes(ut8 tag, ut32 *out_sz, const ut8 *buf, const ut64 len) {
2015-11-24 17:26:10 +00:00
if (!out_sz) return NULL;
if (out_sz) *out_sz = 0;
switch (tag) {
case R_BIN_JAVA_CP_INTEGER:
case R_BIN_JAVA_CP_FLOAT:
return r_bin_java_cp_get_4bytes (tag, out_sz, buf, len);
case R_BIN_JAVA_CP_LONG:
case R_BIN_JAVA_CP_DOUBLE:
return r_bin_java_cp_get_8bytes (tag, out_sz, buf, len);
case R_BIN_JAVA_CP_UTF8:
return r_bin_java_cp_get_utf8 (tag, out_sz, buf, len);
}
return NULL;
}
2014-06-25 00:07:38 +00:00
R_API ut32 r_bin_java_cp_get_size(RBinJavaObj *bin, ut16 idx) {
RBinJavaCPTypeObj* cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, idx);
switch (cp_obj->tag) {
case R_BIN_JAVA_CP_INTEGER:
case R_BIN_JAVA_CP_FLOAT:
return 1 + 4;
case R_BIN_JAVA_CP_LONG:
case R_BIN_JAVA_CP_DOUBLE:
return 1 + 8;
case R_BIN_JAVA_CP_UTF8:
return 1 + 2 + cp_obj->info.cp_utf8.length;
}
return 0;
}
2014-05-12 08:16:15 +00:00
R_API ut64 r_bin_java_get_method_start(RBinJavaObj *bin, RBinJavaField *fm_type) {
return r_bin_java_get_method_code_offset(fm_type) + bin->loadaddr;
}
R_API ut64 r_bin_java_get_method_end(RBinJavaObj *bin, RBinJavaField *fm_type) {
return r_bin_java_get_method_code_offset(fm_type) + bin->loadaddr +
+ r_bin_java_get_method_code_size(fm_type);
}
R_API ut8 * U(r_bin_java_cp_append_method_ref) (RBinJavaObj *bin, ut32 *out_sz, ut16 cn_idx, ut16 fn_idx, ut16 ft_idx) {
return r_bin_java_cp_get_fref_bytes (bin, out_sz, R_BIN_JAVA_CP_METHODREF, cn_idx, fn_idx, ft_idx);
}
R_API ut8 * U(r_bin_java_cp_append_field_ref) (RBinJavaObj *bin, ut32 *out_sz, ut16 cn_idx, ut16 fn_idx, ut16 ft_idx) {
return r_bin_java_cp_get_fref_bytes (bin, out_sz, R_BIN_JAVA_CP_FIELDREF, cn_idx, fn_idx, ft_idx);
}
2014-05-12 08:16:15 +00:00
R_API char * r_bin_java_unmangle_without_flags(const char *name, const char *descriptor) {
return r_bin_java_unmangle (NULL, name, descriptor);
}
2014-06-25 02:11:43 +00:00
R_API void U(r_bin_java_print_stack_map_append_frame_summary)(RBinJavaStackMapFrame *obj) {
RListIter *iter, *iter_tmp;
RList *ptrList;
RBinJavaVerificationObj *ver_obj;
Eprintf ("Stack Map Frame Information\n");
Eprintf (" Tag Value = 0x%02x Name: %s\n", obj->tag, ((RBinJavaStackMapFrameMetas *) obj->metas->type_info)->name);
Eprintf (" Offset: 0x%08"PFMT64x"\n", obj->file_offset);
Eprintf (" Local Variable Count = 0x%04x\n", obj->number_of_locals);
Eprintf (" Local Variables:\n");
ptrList = obj->local_items;
r_list_foreach_safe (ptrList, iter, iter_tmp, ver_obj) {
r_bin_java_print_verification_info_summary (ver_obj);
}
Eprintf (" Stack Items Count = 0x%04x\n", obj->number_of_stack_items);
Eprintf (" Stack Items:\n");
ptrList = obj->stack_items;
r_list_foreach_safe (ptrList, iter, iter_tmp, ver_obj) {
r_bin_java_print_verification_info_summary (ver_obj);
}
}
2014-06-25 02:11:43 +00:00
R_API void U(r_bin_java_stack_frame_default_free) (void *s) {
RBinJavaStackMapFrame *stack_frame = s;
if (stack_frame) {
free (stack_frame->metas);
free (stack_frame);
}
}
2014-06-25 02:11:43 +00:00
R_API void U(r_bin_java_stack_frame_do_nothing_free) (void /*RBinJavaStackMapFrame*/ *stack_frame) {}
R_API void U(r_bin_java_stack_frame_do_nothing_new) (RBinJavaObj *bin, RBinJavaStackMapFrame *stack_frame, ut64 offset) {}
R_API RBinJavaCPTypeMetas* U(r_bin_java_get_cp_meta_from_tag)(ut8 tag) {
ut16 i = 0;
// set default to unknown.
RBinJavaCPTypeMetas *res = &R_BIN_JAVA_CP_METAS[2];
for (i = 0; i < R_BIN_JAVA_CP_METAS_SZ; i++) {
if (tag == R_BIN_JAVA_CP_METAS[i].tag) {
res = &R_BIN_JAVA_CP_METAS[i];
break;
}
}
return res;
}
2014-05-12 02:06:40 +00:00
R_API ut8 * U(r_bin_java_cp_append_ref_cname_fname_ftype) (RBinJavaObj *bin, ut32 *out_sz, ut8 tag, const char *cname, const ut32 c_len, const char *fname, const ut32 f_len, const char *tname, const ut32 t_len) {
2015-11-02 16:27:40 +00:00
ut32 cn_len = 0, fn_len = 0, ft_len = 0, total_len;
ut16 cn_idx = 0, fn_idx = 0, ft_idx = 0;
ut8* bytes = NULL, *cn_bytes = NULL, *fn_bytes = NULL, *ft_bytes = NULL, *cref_bytes = NULL, *fref_bytes = NULL, *fnt_bytes = NULL;
*out_sz = 0;
cn_bytes = r_bin_java_cp_get_utf8 (R_BIN_JAVA_CP_UTF8, &cn_len, (const ut8 *) cname, c_len);
cn_idx = bin->cp_idx+1;
if (cn_bytes) {
fn_bytes = r_bin_java_cp_get_utf8 (R_BIN_JAVA_CP_UTF8, &fn_len, (const ut8 *) fname, f_len);
fn_idx = bin->cp_idx+2;
}
if (fn_bytes) {
ft_bytes = r_bin_java_cp_get_utf8 (R_BIN_JAVA_CP_UTF8, &ft_len, (const ut8 *) tname, t_len);
ft_idx = bin->cp_idx+3;
}
if (cn_bytes && fn_bytes && ft_bytes) {
ut32 cref_len = 0, fnt_len = 0, fref_len = 0;
ut32 cref_idx = 0, fnt_idx = 0;
cref_bytes = r_bin_java_cp_get_classref (bin, &cref_len, NULL, 0, cn_idx);
cref_idx = bin->cp_idx+3;
fnt_bytes = r_bin_java_cp_get_name_type (bin, &fnt_len, fn_idx, ft_idx);
fnt_idx = bin->cp_idx+4;
fref_bytes = r_bin_java_cp_get_2_ut16 (bin, &fref_len, tag, cref_idx, fnt_idx);
if (cref_bytes && fref_bytes && fnt_bytes) {
2015-11-02 16:27:40 +00:00
total_len = cn_len + fn_len + ft_len + cref_len + fnt_len + fref_len + 2;
if (total_len < cn_len) goto beach;
bytes = calloc (1, total_len);
// class name bytes
memcpy (bytes, cn_bytes + *out_sz, cn_len);
*out_sz += cn_len;
// field name bytes
memcpy (bytes, fn_bytes + *out_sz, fn_len);
*out_sz += fn_len;
// field type bytes
memcpy (bytes, ft_bytes + *out_sz, ft_len);
*out_sz += ft_len;
// class ref bytes
memcpy (bytes, cref_bytes + *out_sz, cref_len);
*out_sz += fn_len;
// field name and type bytes
memcpy (bytes, fnt_bytes + *out_sz, fnt_len);
*out_sz += fnt_len;
// field ref bytes
memcpy (bytes, fref_bytes + *out_sz, fref_len);
*out_sz += fref_len;
}
}
2015-11-02 16:27:40 +00:00
beach:
free (cn_bytes);
free (ft_bytes);
free (fn_bytes);
free (fnt_bytes);
free (fref_bytes);
free (cref_bytes);
return bytes;
}
R_API ut8 * U(r_bin_java_cp_get_method_ref) (RBinJavaObj *bin, ut32 *out_sz, ut16 class_idx, ut16 name_and_type_idx) {
return r_bin_java_cp_get_fm_ref (bin, out_sz, R_BIN_JAVA_CP_METHODREF, class_idx, name_and_type_idx);
}
R_API ut8 * U(r_bin_java_cp_get_field_ref) (RBinJavaObj *bin, ut32 *out_sz, ut16 class_idx, ut16 name_and_type_idx) {
return r_bin_java_cp_get_fm_ref (bin, out_sz, R_BIN_JAVA_CP_FIELDREF, class_idx, name_and_type_idx);
}
2014-06-25 00:07:38 +00:00
R_API void U(deinit_java_type_null)() {
free (R_BIN_JAVA_NULL_TYPE.metas);
}
2014-05-12 08:16:15 +00:00
R_API RBinJavaCPTypeObj* r_bin_java_get_item_from_cp(RBinJavaObj *bin, int i) {
if (i < 1 || i > bin->cf.cp_count)
return &R_BIN_JAVA_NULL_TYPE;
RBinJavaCPTypeObj* obj = (RBinJavaCPTypeObj*)r_list_get_n (bin->cp_list, i);
return obj? obj: &R_BIN_JAVA_NULL_TYPE;
}
2014-05-12 02:06:40 +00:00
2014-06-25 02:11:43 +00:00
R_API void U(copy_type_info_to_stack_frame_list) (RList *type_list, RList *sf_list) {
RListIter *iter, *iter_tmp;
RBinJavaVerificationObj *ver_obj, *new_ver_obj;
if (type_list == NULL)
return;
if (sf_list == NULL)
return;
r_list_foreach_safe (type_list, iter, iter_tmp, ver_obj) {
new_ver_obj = (RBinJavaVerificationObj *) malloc (sizeof (RBinJavaVerificationObj));
// FIXME: how to handle failed memory allocation?
if(ver_obj) {
memcpy (new_ver_obj, ver_obj, sizeof (RBinJavaVerificationObj));
r_list_append (sf_list, (void *) new_ver_obj);
}
}
}
2014-05-12 02:06:40 +00:00
2014-06-25 02:11:43 +00:00
R_API void U(copy_type_info_to_stack_frame_list_up_to_idx)(RList *type_list, RList *sf_list, ut64 idx) {
RListIter *iter, *iter_tmp;
RBinJavaVerificationObj *ver_obj, *new_ver_obj;
ut32 pos = 0;
if (type_list == NULL)
return;
if (sf_list == NULL)
return;
r_list_foreach_safe (type_list, iter, iter_tmp, ver_obj) {
new_ver_obj = (RBinJavaVerificationObj *) malloc (sizeof (RBinJavaVerificationObj));
// FIXME: how to handle failed memory allocation?
if(ver_obj) {
memcpy (new_ver_obj, ver_obj, sizeof (RBinJavaVerificationObj));
r_list_append (sf_list, (void *) new_ver_obj);
}
pos++;
if (pos == idx) {
break;
}
}
}
R_API ut8 * r_bin_java_cp_get_idx_bytes(RBinJavaObj *bin, ut16 idx, ut32 *out_sz) {
RBinJavaCPTypeObj* cp_obj = r_bin_java_get_item_from_bin_cp_list (bin, idx);
2015-11-24 17:26:10 +00:00
if (!cp_obj || !out_sz) return NULL;
if (out_sz) *out_sz = 0;
switch (cp_obj->tag) {
case R_BIN_JAVA_CP_INTEGER:
case R_BIN_JAVA_CP_FLOAT:
return r_bin_java_cp_get_4bytes (cp_obj->tag, out_sz, cp_obj->info.cp_integer.bytes.raw, 5);
case R_BIN_JAVA_CP_LONG:
case R_BIN_JAVA_CP_DOUBLE:
return r_bin_java_cp_get_4bytes (cp_obj->tag, out_sz, cp_obj->info.cp_long.bytes.raw, 9);
case R_BIN_JAVA_CP_UTF8:
//eprintf ("Getting idx: %d = %p (3+0x%"PFMT64x")\n", idx, cp_obj, cp_obj->info.cp_utf8.length);
if (cp_obj->info.cp_utf8.length>0)
return r_bin_java_cp_get_utf8 (cp_obj->tag, out_sz,
cp_obj->info.cp_utf8.bytes, cp_obj->info.cp_utf8.length);
}
return NULL;
}
R_API int r_bin_java_valid_class (const ut8 * buf, ut64 buf_sz) {
RBinJavaObj *bin = R_NEW0 (RBinJavaObj), *cur_bin = R_BIN_JAVA_GLOBAL_BIN;
int res = r_bin_java_load_bin (bin, buf, buf_sz);
2015-09-14 00:08:31 +00:00
if (bin->calc_size == buf_sz) res = true;
r_bin_java_free (bin);
R_BIN_JAVA_GLOBAL_BIN = cur_bin;
return res;
}
R_API ut64 r_bin_java_calc_class_size(ut8* bytes, ut64 size) {
RBinJavaObj *bin = R_NEW0 (RBinJavaObj);
RBinJavaObj *cur_bin = R_BIN_JAVA_GLOBAL_BIN;
ut64 bin_size = UT64_MAX;
if (bin) {
if (r_bin_java_load_bin (bin, bytes, size))
bin_size = bin->calc_size;
r_bin_java_free (bin);
R_BIN_JAVA_GLOBAL_BIN = cur_bin;
}
return bin_size;
}
R_API int U(r_bin_java_get_cp_idx_with_name) (RBinJavaObj *bin_obj, const char * name, ut32 len) {
RListIter *iter;
RBinJavaCPTypeObj *obj;
r_list_foreach (bin_obj->cp_list, iter, obj) {
if (obj->tag == R_BIN_JAVA_CP_UTF8) {
if (!strncmp (name, (const char *) obj->info.cp_utf8.bytes, len)) {
return obj->metas->ord;
}
}
}
return 0;
}
R_API void r_bin_java_external_printf(PrintfCallback cb) {
Eprintf = cb? cb: (PrintfCallback)printf;
}