Opcodes 1.3.1 → 1.3.2

data/ChangeLog

@@ -1,3 +1,5 @@
+2013-03-04 :	mkfs <mkfs@thoughtgang.org>
+	*	Fixed build errors
 2013-03-03 :	mkfs <mkfs@thoughtgang.org>
 	*	Updated rakefile to handle new tasks
 2010-08-16 :	mkfs <mkfs@thoughtgang.org>

data/module/Arch.c

@@ -17,6 +17,8 @@ static int generic_print_address_wrapper(bfd_vma vma, disassemble_info *info ) {
 static const Opcodes_disasm_def disasm_definitions[] = {
 /* Goddamn GNU. They make it near-impossible to get a list of supported
  * architectures at build OR run time. */
+// this got broken again.
+#if 0
 	#ifdef ARCH_ALPHA
 		{"alpha", bfd_arch_alpha, bfd_mach_alpha_ev4, print_insn_alpha},
 		{"alphaev4", bfd_arch_alpha, bfd_mach_alpha_ev4, 
@@ -27,7 +29,7 @@ static const Opcodes_disasm_def disasm_definitions[] = {
 			print_insn_alpha},
 	#endif
 	#ifdef ARCH_ARM
-		{"big_arm", bfd_arch_arm, bfd_mach_arm_umknown, 
+		{"big_arm", bfd_arch_arm, bfd_mach_arm_unknown, 
 			print_insn_big_arm},
 		{"little_arm", bfd_arch_arm, bfd_mach_arm_unknown,
 			print_insn_little_arm},
@@ -103,6 +105,7 @@ static const Opcodes_disasm_def disasm_definitions[] = {
 	#ifdef ARCH_I370
 		{"i370", bfd_arch_i370, 0, print_insn_i370},
 	#endif
+#endif
 	#ifdef ARCH_I386
 		{"8086", bfd_arch_i386, bfd_mach_i386_i8086, print_insn_i386},
 		{"x86", bfd_arch_i386, bfd_mach_i386_i386, print_insn_i386},
@@ -115,6 +118,8 @@ static const Opcodes_disasm_def disasm_definitions[] = {
 		{"x86_64_intel", bfd_arch_i386, bfd_mach_x86_64_intel_syntax, 
 			         print_insn_i386},
 	#endif
+// ditto
+#if 0
 	#ifdef ARCH_i860
 		{"i860", bfd_arch_i860, 0, print_insn_i860},
 	#endif
@@ -316,6 +321,7 @@ static const Opcodes_disasm_def disasm_definitions[] = {
 		{"z8001", bfd_arch_z8k, bfd_mach_z8001, print_insn_z8001},
 		{"z8002", bfd_arch_z8k, bfd_mach_z8002, print_insn_z8002},
 	#endif
+#endif
 		/* NULL entry to ensure table ends up ok */
 		{"INVALID", bfd_arch_unknown, 0, generic_print_address_wrapper}
 };

data/module/Opcodes.c

@@ -95,7 +95,6 @@ static void get_available_disassemblers( VALUE * ary ) {
 static const char * insn_type_to_str( enum dis_insn_type t ) {
 	const char *s;
 	switch (t) {
-		case dis_noninsn: s = "Invalid"; break;
 		case dis_nonbranch: s = "Not branch"; break;
 		case dis_branch: s = "Unconditional branch"; break;
 		case dis_condbranch: s = "Conditional branch"; break;
@@ -103,6 +102,8 @@ static const char * insn_type_to_str( enum dis_insn_type t ) {
 		case dis_condjsr: s = "Conditional jump to subroutine"; break;
 		case dis_dref: s = "Data reference"; break;
 		case dis_dref2: s = "Two data references"; break;
+		case dis_noninsn: 
+		default: s = "Invalid";
 	}
 	return s;
 }
@@ -219,7 +220,7 @@ static void config_libopcodes_for_target( struct disassemble_info * info,
 
 		if (! sym.value || (sym.value > sec->vma + sec->size ) ) {
 			rb_raise(rb_eRuntimeError, "Invalid symbol value 0x%X",
-				 ((unsigned long) sym.value));
+				 ((unsigned int) sym.value));
 		}
 			
 		vma_off = sym.value - sec->vma;
@@ -256,7 +257,7 @@ static void load_target( VALUE tgt, struct disasm_target * dest ) {
 
 	} else if ( Qtrue == rb_obj_is_kind_of( tgt, rb_cArray) ) {
 		/* array of bytes */
-		int i;
+		unsigned int i;
 		dest->buf_len = RARRAY_LEN(tgt);
 		dest->buf = calloc(dest->buf_len, 1);
 		for( i=0; i < dest->buf_len; i++ ) {
@@ -312,7 +313,6 @@ static void unload_target( struct disasm_target * tgt ) {
 static void disasm_init( struct disassemble_info * info, 
 			 struct disasm_target * target, bfd_vma * vma, 
 			 VALUE class, VALUE tgt, VALUE hash ) {
-	const char *opts;
 	bfd_vma vma_arg;
 	VALUE var;
 

data/tests/ut_opcodes_bfd.rb

@@ -543,7 +543,7 @@ class TC_OpcodesModuleBfd < Test::Unit::TestCase
   def test_buffer
 
     Bfd::Target.from_buffer( TARGET_BUF ) do |tgt|
-      dis = Opcodes::Disassembler.new( :bfd => tgt ) do |dis|
+      Opcodes::Disassembler.new( :bfd => tgt ) do |dis|
         ops = dis.disasm( tgt.sections['.text'] )
         assert_equal( 145, ops.length )
         assert_equal( 'xor', ops.first[:insn][0].strip )

metadata

@@ -1,35 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: Opcodes
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.3.2
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
 platform: ruby
-authors: 
+authors:
 - TG Community
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-03 00:00:00 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies: []
-
-description: |-
-  Libopcodes is the disassembler library used by
-    GNU binutils. This extension provides access to libopcodes for Ruby
-    IO and BFD objects.
+description: ! "Libopcodes is the disassembler library used by\n  GNU binutils. This
+  extension provides access to libopcodes for Ruby\n  IO and BFD objects."
 email: community@thoughtgang.org
 executables: []
-
-extensions: 
+extensions:
 - module/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - module/rdoc_input/Opcodes.rb
-files: 
+files:
 - module/Opcodes.c
 - module/Arch.c
 - module/ruby_compat.c
@@ -50,40 +40,31 @@ files:
 - module/rdoc_input/Opcodes.rb
 - module/extconf.rb
 homepage: http://rubyforge.org/projects/opdis/
-licenses: 
+licenses:
 - GPLv3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - GNU binutils library and headers
 rubyforge_project: opdis
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby extension library providing an API to GNU libopcodes
-test_files: 
+test_files:
 - tests/ut_opcodes.rb
 - tests/ut_opcodes_bfd.rb