Changeset 5095d40 in thomson

Timestamp:

Mar 13, 2015, 10:12:59 PM (9 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

b3195d1

Parents:

2ee52fb

Message:

Binxploder: split out decb handling.

• It will soon be used in other tools.

git-svn-id: ​svn://localhost/thomson@58 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

Location:

tools

Files:

• binxploder.cpp (modified) (4 diffs)
• decb.cpp (added)

tools/binxploder.cpp

@@ -3 +3 @@
  * This file is distributed under the terms of the MIT Licence.
  */
-
-#include <arpa/inet.h>
 
 #include <stdint.h>
@@ -11 +9 @@
 #include <string.h>
 
-struct __attribute__((packed)) Header {
-        uint8_t type;
-        uint16_t length;
-        uint16_t addr;
-};
+#include "decb.cpp"
 
 int main(int argc, char* argv[])
 {
-        FILE* f1, * f2;
-        Header h;
-
         if (argc < 2)
         {
@@ -28 +19 @@
         }
 
+        FILE* f1, * f2;
+        uint8_t i = 0;
+        DECB_Chunk h;
+
         f1 = fopen(argv[1], "rb");
+        char* buf = (char*)malloc(strlen(argv[1] + 3));
 
-        char* buf = (char*)malloc(strlen(argv[1] + 3));
-        uint8_t i;
-
-        while(fread(&h, sizeof(h), 1, f1))
+        while(DECB_ReadChunk(f1, h))
         {
-                // 6809 is little endian, take that into account...
-                h.length = ntohs(h.length);
-                h.addr = ntohs(h.addr);
-
                 printf("Type: %02x - Size: %04x - Load: %04x\n", h.type, h.length, h.addr);
 
@@ -44 +33 @@
                 f2 = fopen(buf, "wb");
 
-                char* b2 = (char*)malloc(h.length);
-                fread(b2, h.length, 1, f1);
-                fwrite(b2, h.length, 1, f2);
+                fwrite(&h.data[0], h.length, 1, f2);
 
-                free(b2);
                 fclose(f2);
         }