metasm 1.0.3 → 1.0.4

data/samples/metasm-shell.rb

@@ -4,7 +4,7 @@
 #
 #    Licence is LGPL, see LICENCE in the top-level directory
 
-# modifies the standard ruby class String to add #decode and #encode methods
+# modifies the standard ruby class String to add #asm_decode and #asm_encode methods
 # they will respectively disassemble binary data / assemble asm source
 # the default CPU is x86 32bits, change it using eg String.cpu = Metasm::MIPS.new(:big) (mips bigendian)
 #
@@ -31,14 +31,14 @@ class String
   end
 
   # encodes the current string as a Shellcode, returns the resulting EncodedData
-  def encode_edata
+  def asm_encode_edata
     Metasm::Shellcode.assemble(@@cpu, self).encode.encoded
   end
 
   # encodes the current string as a Shellcode, returns the resulting binary String
   # outputs warnings on unresolved relocations
-  def encode
-    ed = encode_edata
+  def asm_encode
+    ed = asm_encode_edata
     if not ed.reloc.empty?
       puts 'W: encoded string has unresolved relocations: ' + ed.reloc.map { |o, r| r.target.inspect }.join(', ')
     end
@@ -48,7 +48,7 @@ class String
 
   # decodes the current string as a Shellcode, with specified base address
   # returns the resulting Disassembler
-  def decode_blocks(base_addr=0, eip=base_addr)
+  def asm_decode_blocks(base_addr=0, eip=base_addr)
     sc = Metasm::Shellcode.decode(self, @@cpu)
     sc.base_addr = base_addr
     sc.disassemble(eip)
@@ -56,8 +56,8 @@ class String
 
   # decodes the current string as a Shellcode, with specified base address
   # returns the asm source equivallent
-  def decode(base_addr=0, eip=base_addr)
-    decode_blocks(base_addr, eip).to_s
+  def asm_decode(base_addr=0, eip=base_addr)
+    asm_decode_blocks(base_addr, eip).to_s
   end
 end
 
@@ -86,7 +86,7 @@ def asm
       begin
         data = line.gsub(';', "\n")
         next if data.strip.empty?
-        e_data = data.encode
+        e_data = data.asm_encode
         puts '"' + e_data.unpack('C*').map { |c| '\\x%02x' % c }.join + '"'
       rescue Metasm::Exception => e
         puts "Error: #{e.class} #{e.message}"

data/tests/all.rb

@@ -4,5 +4,5 @@
 #    Licence is LGPL, see LICENCE in the top-level directory
 
 
-Dir['tests/*.rb'].sort.each { |f| require f }
+Dir[File.expand_path('../*.rb', __FILE__)].sort.each { |f| require f }
 

data/tests/expression.rb

@@ -15,6 +15,8 @@ class TestExpression < Test::Unit::TestCase
 
 	def test_numeric
 		assert_equal(5, E[4, :+, 1].reduce)
+		assert_equal(4, E[5].reduce { |e| e == 5 ? 4 : e })
+		assert_equal(5, E[5].reduce)	# test the previous lambda does not linger around
 	end
 
 	def test_reduce

data/tests/graph_layout.rb

@@ -14,7 +14,7 @@ def test_layout(lo)
 	$cur ||= 0
 	$cur += 1
 	if $target.to_i != 0
-		return if $cur != $target
+		return if $cur != $target.to_i
 	else
 		return if not lo.include? $target
 	end if $target

data/tests/ia32.rb

@@ -29,6 +29,7 @@ class TestIa32 < Test::Unit::TestCase
 		assert_equal(assemble("push eax"), bin("\x50"))
 		assert_equal(assemble("push 2"), bin("\x6a\x02"))
 		assert_equal(assemble("push 142"), bin("\x68\x8e\0\0\0"))
+		assert_equal(assemble("cmp al, 'a'"), bin("\x3c\x61"))
 	end
 
 	def test_sz

data/tests/mips.rb

@@ -110,7 +110,7 @@ EOS
 
 		dasm_src = Metasm::Shellcode.disassemble(Metasm::MIPS.new(:big), sc.encoded.data).to_s
 		lines = dasm_src.respond_to?(:lines) ? dasm_src.lines : dasm_src.to_a
-		assert_equal(28, lines.grep(/\S/).length)
+		assert_equal(26, lines.grep(/^[^\/].*\S/).length)
 	end
 
 	def bin(s)

data/tests/preprocessor.rb

@@ -68,6 +68,23 @@ EOS
 #if defined ( tutu )
 tutu coucou
 #endif
+EOS
+		helper_preparse(<<EOS, 'a1')
+#define tutu
+#if ! defined ( tutu )
+a0
+#else
+a1
+#endif
+EOS
+		helper_preparse(<<EOS, 'a1')
+#define tutu
+#if defined(tutu) ? 0 : 1
+a0
+#endif
+#if defined(toto) ? 0 : 1
+a1
+#endif
 EOS
 		helper_preparse('a #define b', 'a #define b')
 		helper_preparse(<<EOS, "// true !\nblu")
@@ -142,6 +159,7 @@ EOS
 #include <tests/prepro_testinclude.asm>
 out
 EOS
+		rescue Errno::ENOENT
 		ensure
 			File.unlink('tests/prepro_testinclude.asm') rescue nil
 		end

metadata

@@ -1,14 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: metasm
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yoann Guillot
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+  A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+  Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+  MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+  A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+  hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+  RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+  gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+  KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+  QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+  XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+  DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+  LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+  RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+  jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+  6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+  mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+  Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+  WD9f
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIElDCCA3ygAwIBAgIOSBtqBybS6D8mAtSCWs0wDQYJKoZIhvcNAQELBQAwTDEg
+  MB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2Jh
+  bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTYwNjE1MDAwMDAwWhcNMjQw
+  NjE1MDAwMDAwWjBaMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBu
+  di1zYTEwMC4GA1UEAxMnR2xvYmFsU2lnbiBDb2RlU2lnbmluZyBDQSAtIFNIQTI1
+  NiAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjYVVI6kfU6/J
+  7TbCKbVu2PlC9SGLh/BDoS/AP5fjGEfUlk6Iq8Zj6bZJFYXx2Zt7G/3YSsxtToZA
+  F817ukcotdYUQAyG7h5LM/MsVe4hjNq2wf6wTjquUZ+lFOMQ5pPK+vldsZCH7/g1
+  LfyiXCbuexWLH9nDoZc1QbMw/XITrZGXOs5ynQYKdTwfmOPLGC+MnwhKkQrZ2TXZ
+  g5J2Yl7fg67k1gFOzPM8cGFYNx8U42qgr2v02dJsLBkwXaBvUt/RnMngDdl1EWWW
+  2UO0p5A5rkccVMuxlW4l3o7xEhzw127nFE2zGmXWhEpX7gSvYjjFEJtDjlK4Prau
+  niyX/4507wIDAQABo4IBZDCCAWAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdJQQWMBQG
+  CCsGAQUFBwMDBggrBgEFBQcDCTASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQW
+  BBQPOueslJF0LZYCc4OtnC5JPxmqVDAfBgNVHSMEGDAWgBSP8Et/qC5FJK5NUPpj
+  move4t0bvDA+BggrBgEFBQcBAQQyMDAwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3Nw
+  Mi5nbG9iYWxzaWduLmNvbS9yb290cjMwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDov
+  L2NybC5nbG9iYWxzaWduLmNvbS9yb290LXIzLmNybDBjBgNVHSAEXDBaMAsGCSsG
+  AQQBoDIBMjAIBgZngQwBBAEwQQYJKwYBBAGgMgFfMDQwMgYIKwYBBQUHAgEWJmh0
+  dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEB
+  CwUAA4IBAQAVhCgM7aHDGYLbYydB18xjfda8zzabz9JdTAKLWBoWCHqxmJl/2DOK
+  XJ5iCprqkMLFYwQL6IdYBgAHglnDqJQy2eAUTaDVI+DH3brwaeJKRWUtTUmQeGYy
+  DrBowLCIsI7tXAb4XBBIPyNzujtThFKAzfCzFcgRCosFeEZZCNS+t/9L9ZxqTJx2
+  ohGFRYzUN+5Q3eEzNKmhHzoL8VZEim+zM9CxjtEMYAfuMsLwJG+/r/uBAXZnxKPo
+  4KvcM1Uo42dHPOtqpN+U6fSmwIHRUphRptYCtzzqSu/QumXSN4NTS35nfIxA9gcc
+  sK8EBtz4bEaIcpzrTp3DsLlUo7lOl8oU
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIE5jCCA86gAwIBAgIMKDuO03uv6RWXR1uAMA0GCSqGSIb3DQEBCwUAMFoxCzAJ
+  BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTAwLgYDVQQDEydH
+  bG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gU0hBMjU2IC0gRzMwHhcNMTYwOTEz
+  MTgxMDIyWhcNMTkxMTExMTUxNTM4WjBgMQswCQYDVQQGEwJVUzEWMBQGA1UECBMN
+  TWFzc2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9uMRMwEQYDVQQKEwpSYXBpZDcg
+  TExDMRMwEQYDVQQDEwpSYXBpZDcgTExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+  MIIBCgKCAQEAl0HeC0FzN1BJ4nQkxsBng3peS9Bdi9rpSGx+g0Ximd+M/7twmund
+  bzn2JPbNK/Gp/rq/SytrNSLcUzcbH/0z5Ltyw1/jQsGtRBrns0NZSRXqupQDW5R6
+  HFpaIAl3OdsesmIQc/fm0uhh8dkfHVo7UsZO/TeCPoy0uHXTI6aFBPzMMsdz+gf3
+  cCCLsnNKQh/T2Q/jwBs3NTPoyza/pPZcvGogKcWCeNihTO5Rn1Fc71sMHSjQsDtn
+  1fWGKYGi0qjvZ4lpGM9IFZMTbySKHbPLhhHnBOoV7avGemdky3AEsUeiT+6DY0P1
+  IydBy24uVNhGATglME1ttlT4Eme/to0M6wIDAQABo4IBpDCCAaAwDgYDVR0PAQH/
+  BAQDAgeAMIGUBggrBgEFBQcBAQSBhzCBhDBIBggrBgEFBQcwAoY8aHR0cDovL3Nl
+  Y3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Njb2Rlc2lnbnNoYTJnM29jc3Au
+  Y3J0MDgGCCsGAQUFBzABhixodHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vZ3Nj
+  b2Rlc2lnbnNoYTJnMzBWBgNVHSAETzBNMEEGCSsGAQQBoDIBMjA0MDIGCCsGAQUF
+  BwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAIBgZn
+  gQwBBAEwCQYDVR0TBAIwADA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmds
+  b2JhbHNpZ24uY29tL2dzY29kZXNpZ25zaGEyZzMuY3JsMBMGA1UdJQQMMAoGCCsG
+  AQUFBwMDMB0GA1UdDgQWBBSm8RBpBC/cK9VmxzO2+RWnacN8CTAfBgNVHSMEGDAW
+  gBQPOueslJF0LZYCc4OtnC5JPxmqVDANBgkqhkiG9w0BAQsFAAOCAQEANVO3uYQl
+  h8iicbaXE3odrL+kXXmeeNgt4BD3x7GKAVIVixtwBS6pvrshjc1LN0tm3ruiv8oy
+  cq4FiEmVUXZejSRvVVtABeWdZWo+lJ8NxCBUEYYmnMrjgFIbGiEbBsg7PGtyeQsA
+  5Wbg7Lx889mS1tKfQBcPif8EjpTiXNfMiywmpaMYmvm+yQgzrRLDbjz6JV0Rc5Ga
+  WChka+LTPnMtsWJuFM8ka8icMeS28/nAGERdewxWvz+DeAPMORdTJ7aqb6+Y9xuz
+  G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
+  8mVuTXnyJOKRJA==
+  -----END CERTIFICATE-----
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +118,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - john at ofjj.net
@@ -111,6 +205,12 @@ files:
 - metasm/cpu/dalvik/decode.rb
 - metasm/cpu/dalvik/main.rb
 - metasm/cpu/dalvik/opcodes.rb
+- metasm/cpu/ebpf.rb
+- metasm/cpu/ebpf/debug.rb
+- metasm/cpu/ebpf/decode.rb
+- metasm/cpu/ebpf/main.rb
+- metasm/cpu/ebpf/opcodes.rb
+- metasm/cpu/ebpf/render.rb
 - metasm/cpu/ia32.rb
 - metasm/cpu/ia32/compile_c.rb
 - metasm/cpu/ia32/debug.rb
@@ -126,7 +226,6 @@ files:
 - metasm/cpu/mcs51/main.rb
 - metasm/cpu/mcs51/opcodes.rb
 - metasm/cpu/mips.rb
-- metasm/cpu/mips/compile_c.rb
 - metasm/cpu/mips/debug.rb
 - metasm/cpu/mips/decode.rb
 - metasm/cpu/mips/encode.rb
@@ -138,6 +237,13 @@ files:
 - metasm/cpu/msp430/decode.rb
 - metasm/cpu/msp430/main.rb
 - metasm/cpu/msp430/opcodes.rb
+- metasm/cpu/openrisc.rb
+- metasm/cpu/openrisc/debug.rb
+- metasm/cpu/openrisc/decode.rb
+- metasm/cpu/openrisc/decompile.rb
+- metasm/cpu/openrisc/main.rb
+- metasm/cpu/openrisc/opcodes.rb
+- metasm/cpu/openrisc/render.rb
 - metasm/cpu/pic16c/decode.rb
 - metasm/cpu/pic16c/main.rb
 - metasm/cpu/pic16c/opcodes.rb
@@ -161,6 +267,13 @@ files:
 - metasm/cpu/st20/decompile.rb
 - metasm/cpu/st20/main.rb
 - metasm/cpu/st20/opcodes.rb
+- metasm/cpu/webasm.rb
+- metasm/cpu/webasm/debug.rb
+- metasm/cpu/webasm/decode.rb
+- metasm/cpu/webasm/decompile.rb
+- metasm/cpu/webasm/encode.rb
+- metasm/cpu/webasm/main.rb
+- metasm/cpu/webasm/opcodes.rb
 - metasm/cpu/x86_64.rb
 - metasm/cpu/x86_64/compile_c.rb
 - metasm/cpu/x86_64/debug.rb
@@ -205,6 +318,7 @@ files:
 - metasm/exe_format/shellcode.rb
 - metasm/exe_format/shellcode_rwx.rb
 - metasm/exe_format/swf.rb
+- metasm/exe_format/wasm.rb
 - metasm/exe_format/xcoff.rb
 - metasm/exe_format/zip.rb
 - metasm/gui.rb
@@ -223,6 +337,7 @@ files:
 - metasm/gui/win32.rb
 - metasm/gui/x11.rb
 - metasm/main.rb
+- metasm/os/emulator.rb
 - metasm/os/gdbremote.rb
 - metasm/os/gnu_exports.rb
 - metasm/os/linux.rb
@@ -241,6 +356,7 @@ files:
 - misc/metasm-all.rb
 - misc/objdiff.rb
 - misc/objscan.rb
+- misc/openrisc-parser.rb
 - misc/pdfparse.rb
 - misc/ppc_pdf2oplist.rb
 - misc/tcp_proxy_hex.rb
@@ -289,6 +405,8 @@ files:
 - samples/elf_list_needed.rb
 - samples/elf_listexports.rb
 - samples/elfencode.rb
+- samples/emubios.rb
+- samples/emudbg.rb
 - samples/exeencode.rb
 - samples/factorize-headers-elfimports.rb
 - samples/factorize-headers-peimports.rb
@@ -340,7 +458,7 @@ files:
 - tests/x86_64.rb
 homepage: http://metasm.cr0.org
 licenses:
-- LGPL
+- LGPL-2.1
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -358,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Metasm is a cross-architecture assembler, disassembler, linker, and debugger.