Compare commits
7 Commits
4fab6ffd3a
...
dev
Author | SHA1 | Date | |
---|---|---|---|
b49ae6e46c | |||
29fdc841b7 | |||
dc30188593 | |||
2bea5d288c | |||
8a0226a5ea | |||
ed6373473c | |||
80b5f5b1b3 |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -4,3 +4,6 @@
|
|||||||
[submodule "linklist-lib"]
|
[submodule "linklist-lib"]
|
||||||
path = linklist-lib
|
path = linklist-lib
|
||||||
url = https://git.shimatta.de/mhu/linklist-lib.git
|
url = https://git.shimatta.de/mhu/linklist-lib.git
|
||||||
|
[submodule "test/catch2"]
|
||||||
|
path = test/catch2
|
||||||
|
url = https://git.shimatta.de/3rd-party/catch2.git
|
||||||
|
2
3rdparty/libfort
vendored
2
3rdparty/libfort
vendored
Submodule 3rdparty/libfort updated: 41237162a9...5a8f9312bd
@@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required(VERSION 3.5)
|
cmake_minimum_required(VERSION 3.5...3.18)
|
||||||
|
|
||||||
project(patchelfcrc LANGUAGES C)
|
project(patchelfcrc LANGUAGES C)
|
||||||
|
|
||||||
@@ -91,3 +91,5 @@ else (DOXYGEN_FOUND)
|
|||||||
message("${BoldMagenta}Doxygen needs to be installed to generate the doxygen documentation${ColorReset}")
|
message("${BoldMagenta}Doxygen needs to be installed to generate the doxygen documentation${ColorReset}")
|
||||||
message("${BoldMagenta}doxygen target will not be available${ColorReset}")
|
message("${BoldMagenta}doxygen target will not be available${ColorReset}")
|
||||||
endif (DOXYGEN_FOUND)
|
endif (DOXYGEN_FOUND)
|
||||||
|
|
||||||
|
add_subdirectory(test)
|
||||||
|
9
bash-completion/patchelfcrc
Normal file
9
bash-completion/patchelfcrc
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function _patchelfcrc() {
|
||||||
|
echo "Cursor index: $COMP_CWORD"
|
||||||
|
echo "line as array: $COMP_WORDS"
|
||||||
|
echo "line as string: $COMP_LINE"
|
||||||
|
}
|
||||||
|
|
||||||
|
complete -F _patchelfcrc patchelfcrc
|
Submodule linklist-lib updated: c20b5c2528...fdd99bad48
@@ -61,7 +61,7 @@
|
|||||||
: Export the calculated files to an XML file *XMLFILE*.
|
: Export the calculated files to an XML file *XMLFILE*.
|
||||||
|
|
||||||
**--import**=*XMLFILE*
|
**--import**=*XMLFILE*
|
||||||
: Import the CRCs from an XML file *XMLFILE* and do not caclulate anything in the given *ELF*
|
: Import the CRCs from an XML file *XMLFILE* and do not calculate anything in the given *ELF*
|
||||||
|
|
||||||
**--help**, **-h**, **-?**
|
**--help**, **-h**, **-?**
|
||||||
: Print help.
|
: Print help.
|
||||||
@@ -134,7 +134,7 @@
|
|||||||
|
|
||||||
**patchelfcrc** -l -g word --start-magic=0x12345678 --end-magic=0x8754321 -p crc-32-mpeg -f bare -O .outputsection -S .text executable.elf
|
**patchelfcrc** -l -g word --start-magic=0x12345678 --end-magic=0x8754321 -p crc-32-mpeg -f bare -O .outputsection -S .text executable.elf
|
||||||
: Calculate the CRC over *.text* section and place the result in the *.outputsection* section.
|
: Calculate the CRC over *.text* section and place the result in the *.outputsection* section.
|
||||||
The output sections start and end are checked for the given magic numbers in order to assure correct memory layout.
|
The output sections start and end are checked for the given magic numbers in order to ensure correct memory layout.
|
||||||
*CRC-32-MPEG* is used as CRC algorithm.
|
*CRC-32-MPEG* is used as CRC algorithm.
|
||||||
The memory is interpreted as *little endian* and the CRC calculation granularity is a 32 bit *word*.
|
The memory is interpreted as *little endian* and the CRC calculation granularity is a 32 bit *word*.
|
||||||
|
|
||||||
|
12
src/main.c
12
src/main.c
@@ -239,12 +239,11 @@ static void prepare_default_opts(struct command_line_options *opts)
|
|||||||
opts->output_section = NULL;
|
opts->output_section = NULL;
|
||||||
opts->export_xml = NULL;
|
opts->export_xml = NULL;
|
||||||
opts->import_xml = NULL;
|
opts->import_xml = NULL;
|
||||||
|
opts->force_nocolor = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_verbose_start_info(const struct command_line_options *cmd_opts)
|
static void print_verbose_start_info(const struct command_line_options *cmd_opts)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
SlList *list_iter;
|
|
||||||
const struct named_crc *predef_crc;
|
const struct named_crc *predef_crc;
|
||||||
|
|
||||||
print_debug("Start CRC patching\n");
|
print_debug("Start CRC patching\n");
|
||||||
@@ -278,11 +277,6 @@ static void print_verbose_start_info(const struct command_line_options *cmd_opts
|
|||||||
|
|
||||||
if (cmd_opts->import_xml)
|
if (cmd_opts->import_xml)
|
||||||
print_debug("Import CRCs from '%s'\n", cmd_opts->import_xml);
|
print_debug("Import CRCs from '%s'\n", cmd_opts->import_xml);
|
||||||
|
|
||||||
if (cmd_opts->section_list) {
|
|
||||||
for (list_iter = cmd_opts->section_list, i = 1; list_iter; list_iter = sl_list_next(list_iter), i++)
|
|
||||||
print_debug("Input section [%d]: \"%s\"\n", i, (const char *)list_iter->data);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void free_cmd_args(struct command_line_options *opts)
|
static void free_cmd_args(struct command_line_options *opts)
|
||||||
@@ -459,7 +453,7 @@ int main(int argc, char **argv)
|
|||||||
print_warn("--use-vma option only has an effect when exporting as struct output.\n");
|
print_warn("--use-vma option only has an effect when exporting as struct output.\n");
|
||||||
|
|
||||||
if (!cmd_opts.output_section && cmd_opts.export_xml == NULL)
|
if (!cmd_opts.output_section && cmd_opts.export_xml == NULL)
|
||||||
print_warn("No output section / XML export specified. Will continue but not create any output\n");
|
print_warn("No output section or XML export specified. Will continue but not create any output.\n");
|
||||||
|
|
||||||
/* Prepare libelf for use with the latest ELF version */
|
/* Prepare libelf for use with the latest ELF version */
|
||||||
elf_version(EV_CURRENT);
|
elf_version(EV_CURRENT);
|
||||||
@@ -501,7 +495,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
if (cmd_opts.export_xml) {
|
if (cmd_opts.export_xml) {
|
||||||
if (xml_write_crcs_to_file(cmd_opts.export_xml, crc_data)) {
|
if (xml_write_crcs_to_file(cmd_opts.export_xml, crc_data)) {
|
||||||
print_err("Error during XML generation\n");
|
print_err("Error during XML generation.\n");
|
||||||
ret = -3;
|
ret = -3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
11
test/CMakeLists.txt
Normal file
11
test/CMakeLists.txt
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
|
project(patchelfcrc-test LANGUAGES CXX C)
|
||||||
|
add_subdirectory(catch2 EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
|
add_custom_target(test "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}" "-r compact" "-s" DEPENDS ${PROJECT_NAME})
|
||||||
|
aux_source_directory("src" TEST_SOURCES)
|
||||||
|
set(DUT_SOURCES ${CMAKE_CURRENT_LIST_DIR}/../src/crc.c)
|
||||||
|
|
||||||
|
add_executable(${PROJECT_NAME} EXCLUDE_FROM_ALL ${TEST_SOURCES} ${DUT_SOURCES})
|
||||||
|
target_link_libraries(${PROJECT_NAME} PRIVATE Catch2::Catch2WithMain)
|
1
test/catch2
Submodule
1
test/catch2
Submodule
Submodule test/catch2 added at 0631b607ee
Reference in New Issue
Block a user