Mercurial > lcfOS
diff test/testbintools.py @ 385:d056b552d3f4
Made better use of layout
| author | Windel Bouwman |
|---|---|
| date | Thu, 01 May 2014 14:03:12 +0200 |
| parents | 173e20a47fda |
| children |
line wrap: on
line diff
--- a/test/testbintools.py Sun Apr 27 17:50:25 2014 +0200 +++ b/test/testbintools.py Thu May 01 14:03:12 2014 +0200 @@ -60,7 +60,7 @@ o1.add_relocation('undefined_sym', 0, 'rel8', '.text') o2 = ObjectFile() with self.assertRaises(CompilerError): - o3 = link([o1, o2], layout.Layout()) + o3 = link([o1, o2], layout.Layout(), 'arm') def testDuplicateSymbol(self): o1 = ObjectFile() @@ -70,7 +70,7 @@ o2.get_section('.text') o2.add_symbol('a', 0, '.text') with self.assertRaises(CompilerError): - o3 = link([o1, o2], layout.Layout()) + o3 = link([o1, o2], layout.Layout(), 'arm') def testRel8Relocation(self): o1 = ObjectFile() @@ -79,7 +79,7 @@ o2 = ObjectFile() o2.get_section('.text').add_data(bytes([0]*100)) o2.add_symbol('a', 24, '.text') - o3 = link([o1, o2], layout.Layout()) + o3 = link([o1, o2], layout.Layout(), 'arm') def testSymbolValues(self): o1 = ObjectFile() @@ -88,7 +88,7 @@ o2 = ObjectFile() o2.get_section('.text').add_data(bytes([0]*100)) o2.add_symbol('a', 2, '.text') - o3 = link([o1, o2], layout.Layout()) + o3 = link([o1, o2], layout.Layout(), 'arm') self.assertEqual(110, o3.find_symbol('a').value) self.assertEqual(24, o3.find_symbol('b').value) self.assertEqual(208, o3.get_section('.text').Size) @@ -111,10 +111,10 @@ o2.get_section('data').add_data(bytes([0]*100)) o2.add_symbol('a', 2, 'data') o2.add_symbol('c', 2, 'code') - o3 = link([o1, o2], memory_layout) - self.assertEqual(0x20000000+2, o3.find_symbol('a').value) - self.assertEqual(0x08000000+24, o3.find_symbol('b').value) - self.assertEqual(0x08000000+110, o3.find_symbol('c').value) + o3 = link([o1, o2], memory_layout, 'arm') + self.assertEqual(0x20000000+2, o3.get_symbol_value('a')) + self.assertEqual(0x08000000+24, o3.get_symbol_value('b')) + self.assertEqual(0x08000000+110, o3.get_symbol_value('c')) self.assertEqual(208, o3.get_section('code').Size) self.assertEqual(100, o3.get_section('data').Size)