summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-12-07 12:29:56 +0800
committerruki <[email protected]>2025-12-07 17:15:59 +0800
commitbbfd1bd9a4ae413354f37f46935097cf591b6c6c (patch)
treef1bfbc544591ec23120e845d1147d218e7dadc40
parent282349621e4e7c02fa3cb7a6df2d523fbba3c9d7 (diff)
improve dump bin2obj
-rw-r--r--tests/projects/other/bin2obj/src/image.png1
-rw-r--r--tests/projects/other/bin2obj/src/main.c58
-rw-r--r--tests/projects/other/bin2obj/src/xmake.icobin0 -> 119943 bytes
-rw-r--r--tests/projects/other/bin2obj/xmake.lua4
4 files changed, 55 insertions, 8 deletions
diff --git a/tests/projects/other/bin2obj/src/image.png b/tests/projects/other/bin2obj/src/image.png
deleted file mode 100644
index d2c2e1ac6..000000000
--- a/tests/projects/other/bin2obj/src/image.png
+++ /dev/null
@@ -1 +0,0 @@
-fake image
diff --git a/tests/projects/other/bin2obj/src/main.c b/tests/projects/other/bin2obj/src/main.c
index 196247654..bc1d2442f 100644
--- a/tests/projects/other/bin2obj/src/main.c
+++ b/tests/projects/other/bin2obj/src/main.c
@@ -5,15 +5,30 @@
extern const uint8_t _binary_data_bin_start[];
extern const uint8_t _binary_data_bin_end[];
-extern const uint8_t _binary_image_png_start[];
-extern const uint8_t _binary_image_png_end[];
+extern const uint8_t _binary_xmake_ico_start[];
+extern const uint8_t _binary_xmake_ico_end[];
static void hexdump(const char* name, const uint8_t* data, uint32_t size) {
printf("%s: size: %u bytes\n", name, (unsigned int)size);
if (size == 0) {
return;
}
- for (uint32_t offset = 0; offset < size; offset += 16) {
+
+ // if file is larger than 128 bytes, only dump first 64 and last 64 bytes
+ uint32_t dump_size = size;
+ uint32_t start_offset = 0;
+ uint32_t end_offset = 0;
+ uint32_t skip_size = 0;
+
+ if (size > 128) {
+ dump_size = 64;
+ start_offset = 0;
+ end_offset = size - 64;
+ skip_size = end_offset - start_offset - dump_size;
+ }
+
+ // dump start
+ for (uint32_t offset = start_offset; offset < start_offset + dump_size; offset += 16) {
// print offset
printf("%08x ", (unsigned int)offset);
@@ -37,14 +52,47 @@ static void hexdump(const char* name, const uint8_t* data, uint32_t size) {
}
printf("|\n");
}
+
+ // print skip indicator if needed
+ if (skip_size > 0) {
+ printf(" ... (skipped %u bytes) ...\n", (unsigned int)skip_size);
+ }
+
+ // dump end if needed
+ if (size > 128) {
+ for (uint32_t offset = end_offset; offset < size; offset += 16) {
+ // print offset
+ printf("%08x ", (unsigned int)offset);
+
+ // print hex bytes (8 bytes, space, 8 bytes)
+ for (uint32_t i = 0; i < 16; i++) {
+ if (offset + i < size) {
+ printf("%02x ", data[offset + i]);
+ } else {
+ printf(" ");
+ }
+ if (i == 7) {
+ printf(" ");
+ }
+ }
+
+ // print ASCII representation
+ printf(" |");
+ for (uint32_t i = 0; i < 16 && offset + i < size; i++) {
+ uint8_t c = data[offset + i];
+ printf("%c", isprint(c) ? c : '.');
+ }
+ printf("|\n");
+ }
+ }
}
int main(int argc, char** argv) {
const uint32_t _binary_data_bin_size = (uint32_t)(_binary_data_bin_end - _binary_data_bin_start);
- const uint32_t _binary_image_png_size = (uint32_t)(_binary_image_png_end - _binary_image_png_start);
+ const uint32_t _binary_xmake_ico_size = (uint32_t)(_binary_xmake_ico_end - _binary_xmake_ico_start);
hexdump("data.bin", _binary_data_bin_start, _binary_data_bin_size);
printf("\n");
- hexdump("image.png", _binary_image_png_start, _binary_image_png_size);
+ hexdump("xmake.ico", _binary_xmake_ico_start, _binary_xmake_ico_size);
return 0;
}
diff --git a/tests/projects/other/bin2obj/src/xmake.ico b/tests/projects/other/bin2obj/src/xmake.ico
new file mode 100644
index 000000000..52c8ef389
--- /dev/null
+++ b/tests/projects/other/bin2obj/src/xmake.ico
Binary files differ
diff --git a/tests/projects/other/bin2obj/xmake.lua b/tests/projects/other/bin2obj/xmake.lua
index 3f00aebf9..ed0de51fc 100644
--- a/tests/projects/other/bin2obj/xmake.lua
+++ b/tests/projects/other/bin2obj/xmake.lua
@@ -2,7 +2,7 @@ add_rules("mode.debug", "mode.release")
target("test")
set_kind("binary")
- add_rules("utils.bin2obj", {extensions = {".bin", ".png"}})
+ add_rules("utils.bin2obj", {extensions = {".bin", ".ico"}})
add_files("src/*.c")
add_files("src/data.bin", {zeroend = true})
- add_files("src/*.png")
+ add_files("src/*.ico")