From c0bd4173aa3b8f49153964d5a3ff311fc7d59651 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Thu, 17 Jun 2010 16:59:51 +0000 Subject: Make sure files which aren't windows-specific use \n line endings only git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26893 a1c6a512-1295-4272-9138-f99709370657 --- utils/MTP/beastpatcher/mtp_win32.c | 464 ++++++++++---------- utils/MTP/sendfirm_win.c | 174 ++++---- utils/disassembler/arm/disasm_arm.c | 846 ++++++++++++++++++------------------ utils/disassembler/arm/main.c | 264 +++++------ utils/jz4740_tools/HXFmerge.c | 642 +++++++++++++-------------- utils/jz4740_tools/HXFreplace.c | 484 ++++++++++----------- utils/jz4740_tools/HXFsplit.c | 642 +++++++++++++-------------- 7 files changed, 1758 insertions(+), 1758 deletions(-) (limited to 'utils') diff --git a/utils/MTP/beastpatcher/mtp_win32.c b/utils/MTP/beastpatcher/mtp_win32.c index 7a7c6db769..15d0d705e2 100644 --- a/utils/MTP/beastpatcher/mtp_win32.c +++ b/utils/MTP/beastpatcher/mtp_win32.c @@ -1,232 +1,232 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * $Id$ - * - * Copyright (c) 2009, Dave Chapman - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "mtp_common.h" - -#include "../MTP_DLL/MTP_DLL.h" - - -static int filesize(const char* filename); - - -int mtp_init(struct mtp_info_t* mtp_info) -{ - /* Fill the info struct with zeros - mainly for the strings */ - memset(mtp_info, 0, sizeof(struct mtp_info_t)); - - return 0; - -} - -int mtp_finished(struct mtp_info_t* mtp_info) -{ - (void)mtp_info; - - return 0; -} - -int mtp_scan(struct mtp_info_t* mtp_info) -{ - wchar_t name[256]; - wchar_t manufacturer[256]; - DWORD version; - int num = 0; - - num = mtp_description(name, manufacturer, &version); - - wcstombs(mtp_info->manufacturer, manufacturer, 200); - wcstombs(mtp_info->modelname, name, 200); - - sprintf(mtp_info->version, "%x", (unsigned int)version); - return (num > 0) ? num : -1; - -} - -static void callback(unsigned int progress, unsigned int max) -{ - int percent = (progress * 100) / max; - - printf("[INFO] Progress: %u of %u (%d%%)\r", progress, max, percent); - fflush(stdout); -} - - -int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf, - int fwsize) -{ - HANDLE hTempFile; - DWORD dwRetVal; - DWORD dwBytesWritten; - UINT uRetVal; - TCHAR szTempName[1024]; - TCHAR lpPathBuffer[1024]; - BOOL fSuccess; - wchar_t *tmp; - int ret; - - (void)mtp_info; - - /* Get the path for temporary files */ - dwRetVal = GetTempPath(sizeof(lpPathBuffer), lpPathBuffer); - if (dwRetVal > sizeof(lpPathBuffer) || (dwRetVal == 0)) - { - fprintf(stderr, "[ERR] GetTempPath failed (%d)\n", (int)GetLastError()); - return -1; - } - - /* Create the temporary file */ - uRetVal = GetTempFileName(lpPathBuffer, TEXT("NKBIN"), 0, szTempName); - if (uRetVal == 0) - { - fprintf(stderr, "[ERR] GetTempFileName failed (%d)\n", (int)GetLastError()); - return -1; - } - - /* Now create the file */ - hTempFile = CreateFile((LPTSTR) szTempName, // file name - GENERIC_READ | GENERIC_WRITE, // open r-w - 0, // do not share - NULL, // default security - CREATE_ALWAYS, // overwrite existing - FILE_ATTRIBUTE_NORMAL,// normal file - NULL); // no template - if (hTempFile == INVALID_HANDLE_VALUE) - { - fprintf(stderr, "[ERR] Could not create %s\n", szTempName); - return -1; - } - - fSuccess = WriteFile(hTempFile, fwbuf, fwsize, &dwBytesWritten, NULL); - if (!fSuccess) - { - fprintf(stderr, "[ERR] WriteFile failed (%d)\n", (int)GetLastError()); - return -1; - } - - fSuccess = CloseHandle (hTempFile); - if (!fSuccess) - { - fprintf(stderr, "[ERR] CloseHandle failed (%d)\n", (int)GetLastError()); - return -1; - } - - tmp = (LPWSTR)malloc(_tcslen(szTempName)*2+1); - mbstowcs(tmp, (char*)szTempName, _tcslen(szTempName)*2+1); - - fprintf(stderr, "[INFO] Sending firmware...\n"); - if (mtp_sendnk(tmp, fwsize, &callback)) - { - fprintf(stderr, "\n"); - fprintf(stderr, "[INFO] Firmware sent successfully\n"); - ret = 0; - } - else - { - fprintf(stderr, "\n"); - fprintf(stderr, "[ERR] Error occured during sending.\n"); - ret = -1; - } - free(tmp); - - if (!DeleteFile(szTempName)) - fprintf(stderr,"[WARN] Could not remove temporary file %s\n",szTempName); - - return ret; -} - - -int mtp_send_file(struct mtp_info_t* mtp_info, const char* filename) -{ - wchar_t *fn; - - fn = (LPWSTR)malloc(strlen(filename)*2+1); - mbstowcs(fn, filename, strlen(filename)*2+1); - - if (mtp_init(mtp_info) < 0) { - fprintf(stderr,"[ERR] Can not init MTP\n"); - return 1; - } - /* Scan for attached MTP devices. */ - if (mtp_scan(mtp_info) < 0) - { - fprintf(stderr,"[ERR] No devices found\n"); - return 1; - } - - fprintf(stderr, "[INFO] Sending firmware...\n"); - if (mtp_sendnk(fn, filesize(filename), &callback)) - { - /* keep progress on screen */ - printf("\n"); - fprintf(stderr, "[INFO] Firmware sent successfully\n"); - return 0; - } - else - { - fprintf(stderr, "[ERR] Error occured during sending.\n"); - return -1; - } - mtp_finished(mtp_info); -} - - -static int filesize(const char* filename) -{ - struct _stat sb; - int res; - - res = _stat(filename, &sb); - if(res == -1) { - fprintf(stderr, "Error getting filesize!\n"); - return -1; - } - return sb.st_size; -} - +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * $Id$ + * + * Copyright (c) 2009, Dave Chapman + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "mtp_common.h" + +#include "../MTP_DLL/MTP_DLL.h" + + +static int filesize(const char* filename); + + +int mtp_init(struct mtp_info_t* mtp_info) +{ + /* Fill the info struct with zeros - mainly for the strings */ + memset(mtp_info, 0, sizeof(struct mtp_info_t)); + + return 0; + +} + +int mtp_finished(struct mtp_info_t* mtp_info) +{ + (void)mtp_info; + + return 0; +} + +int mtp_scan(struct mtp_info_t* mtp_info) +{ + wchar_t name[256]; + wchar_t manufacturer[256]; + DWORD version; + int num = 0; + + num = mtp_description(name, manufacturer, &version); + + wcstombs(mtp_info->manufacturer, manufacturer, 200); + wcstombs(mtp_info->modelname, name, 200); + + sprintf(mtp_info->version, "%x", (unsigned int)version); + return (num > 0) ? num : -1; + +} + +static void callback(unsigned int progress, unsigned int max) +{ + int percent = (progress * 100) / max; + + printf("[INFO] Progress: %u of %u (%d%%)\r", progress, max, percent); + fflush(stdout); +} + + +int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf, + int fwsize) +{ + HANDLE hTempFile; + DWORD dwRetVal; + DWORD dwBytesWritten; + UINT uRetVal; + TCHAR szTempName[1024]; + TCHAR lpPathBuffer[1024]; + BOOL fSuccess; + wchar_t *tmp; + int ret; + + (void)mtp_info; + + /* Get the path for temporary files */ + dwRetVal = GetTempPath(sizeof(lpPathBuffer), lpPathBuffer); + if (dwRetVal > sizeof(lpPathBuffer) || (dwRetVal == 0)) + { + fprintf(stderr, "[ERR] GetTempPath failed (%d)\n", (int)GetLastError()); + return -1; + } + + /* Create the temporary file */ + uRetVal = GetTempFileName(lpPathBuffer, TEXT("NKBIN"), 0, szTempName); + if (uRetVal == 0) + { + fprintf(stderr, "[ERR] GetTempFileName failed (%d)\n", (int)GetLastError()); + return -1; + } + + /* Now create the file */ + hTempFile = CreateFile((LPTSTR) szTempName, // file name + GENERIC_READ | GENERIC_WRITE, // open r-w + 0, // do not share + NULL, // default security + CREATE_ALWAYS, // overwrite existing + FILE_ATTRIBUTE_NORMAL,// normal file + NULL); // no template + if (hTempFile == INVALID_HANDLE_VALUE) + { + fprintf(stderr, "[ERR] Could not create %s\n", szTempName); + return -1; + } + + fSuccess = WriteFile(hTempFile, fwbuf, fwsize, &dwBytesWritten, NULL); + if (!fSuccess) + { + fprintf(stderr, "[ERR] WriteFile failed (%d)\n", (int)GetLastError()); + return -1; + } + + fSuccess = CloseHandle (hTempFile); + if (!fSuccess) + { + fprintf(stderr, "[ERR] CloseHandle failed (%d)\n", (int)GetLastError()); + return -1; + } + + tmp = (LPWSTR)malloc(_tcslen(szTempName)*2+1); + mbstowcs(tmp, (char*)szTempName, _tcslen(szTempName)*2+1); + + fprintf(stderr, "[INFO] Sending firmware...\n"); + if (mtp_sendnk(tmp, fwsize, &callback)) + { + fprintf(stderr, "\n"); + fprintf(stderr, "[INFO] Firmware sent successfully\n"); + ret = 0; + } + else + { + fprintf(stderr, "\n"); + fprintf(stderr, "[ERR] Error occured during sending.\n"); + ret = -1; + } + free(tmp); + + if (!DeleteFile(szTempName)) + fprintf(stderr,"[WARN] Could not remove temporary file %s\n",szTempName); + + return ret; +} + + +int mtp_send_file(struct mtp_info_t* mtp_info, const char* filename) +{ + wchar_t *fn; + + fn = (LPWSTR)malloc(strlen(filename)*2+1); + mbstowcs(fn, filename, strlen(filename)*2+1); + + if (mtp_init(mtp_info) < 0) { + fprintf(stderr,"[ERR] Can not init MTP\n"); + return 1; + } + /* Scan for attached MTP devices. */ + if (mtp_scan(mtp_info) < 0) + { + fprintf(stderr,"[ERR] No devices found\n"); + return 1; + } + + fprintf(stderr, "[INFO] Sending firmware...\n"); + if (mtp_sendnk(fn, filesize(filename), &callback)) + { + /* keep progress on screen */ + printf("\n"); + fprintf(stderr, "[INFO] Firmware sent successfully\n"); + return 0; + } + else + { + fprintf(stderr, "[ERR] Error occured during sending.\n"); + return -1; + } + mtp_finished(mtp_info); +} + + +static int filesize(const char* filename) +{ + struct _stat sb; + int res; + + res = _stat(filename, &sb); + if(res == -1) { + fprintf(stderr, "Error getting filesize!\n"); + return -1; + } + return sb.st_size; +} + diff --git a/utils/MTP/sendfirm_win.c b/utils/MTP/sendfirm_win.c index 3c45aa6ae7..c74b93bb37 100644 --- a/utils/MTP/sendfirm_win.c +++ b/utils/MTP/sendfirm_win.c @@ -1,87 +1,87 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - - -#include -#include -#include -#include -#include -#include -#include - -#include "MTP_DLL/MTP_DLL.h" - -void usage(void) -{ - fprintf(stderr, "usage: sendfirm \n"); -} - -int filesize(char* filename) -{ - FILE* fd; - int tmp; - fd = fopen(filename, "r"); - if(fd == NULL) - { - fprintf(stderr, "Error while opening %s!\n", filename); - return -1; - } - fseek(fd, 0, SEEK_END); - tmp = ftell(fd); - fclose(fd); - return tmp; -} - -void callback(unsigned int progress, unsigned int max) -{ - unsigned int normalized = progress*1000/max; - printf("Progress: %d.%d%%\r", normalized/10, normalized%10); - fflush(stdout); -} - -int main(int argc, char **argv) -{ - if (argc < 2) - { - usage(); - return 1; - } - - wchar_t *tmp; - - tmp = (LPWSTR)malloc(strlen(argv[1])*2+1); - mbstowcs(tmp, argv[1], strlen(argv[1])*2+1); - - wprintf(tmp); - printf("\n"); - - fprintf(stdout, "Sending firmware...\n"); - - if(mtp_sendnk(tmp, filesize(argv[1]), &callback)) - fprintf(stdout, "Firmware sent successfully!\n"); - else - fprintf(stdout, "Error occured during sending!\n"); - - free(tmp); - - exit(0); -} +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 Maurus Cuelenaere + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#include +#include +#include +#include +#include +#include +#include + +#include "MTP_DLL/MTP_DLL.h" + +void usage(void) +{ + fprintf(stderr, "usage: sendfirm \n"); +} + +int filesize(char* filename) +{ + FILE* fd; + int tmp; + fd = fopen(filename, "r"); + if(fd == NULL) + { + fprintf(stderr, "Error while opening %s!\n", filename); + return -1; + } + fseek(fd, 0, SEEK_END); + tmp = ftell(fd); + fclose(fd); + return tmp; +} + +void callback(unsigned int progress, unsigned int max) +{ + unsigned int normalized = progress*1000/max; + printf("Progress: %d.%d%%\r", normalized/10, normalized%10); + fflush(stdout); +} + +int main(int argc, char **argv) +{ + if (argc < 2) + { + usage(); + return 1; + } + + wchar_t *tmp; + + tmp = (LPWSTR)malloc(strlen(argv[1])*2+1); + mbstowcs(tmp, argv[1], strlen(argv[1])*2+1); + + wprintf(tmp); + printf("\n"); + + fprintf(stdout, "Sending firmware...\n"); + + if(mtp_sendnk(tmp, filesize(argv[1]), &callback)) + fprintf(stdout, "Firmware sent successfully!\n"); + else + fprintf(stdout, "Error occured during sending!\n"); + + free(tmp); + + exit(0); +} diff --git a/utils/disassembler/arm/disasm_arm.c b/utils/disassembler/arm/disasm_arm.c index b23c6b0355..14e72d9583 100644 --- a/utils/disassembler/arm/disasm_arm.c +++ b/utils/disassembler/arm/disasm_arm.c @@ -1,423 +1,423 @@ -#include -#include -#include - -#define ULONG uint32_t -#define UCHAR uint8_t - -#define FRMT "0x%x" // "0x%x" -#define SHFTFRMC "%s %s #%d" // "%s %s %d" -#define SHFTFRMR "%s %s %s" // "%s %s %s" -//#define FRMT "0x%x" -//#define SHFTFRMC "%s %s %d" -//#define SHFTFRMR "%s %s %s" - -char *cond[16] = { "eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", "hi", "ls", "ge", "lt", "gt", "le", "", "nv" }; -char *cnd1[16] = { "eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", "hi", "ls", "ge", "lt", "gt", "le", " ", "nv" }; -char *opcd[16] = {"and","eor","sub","rsb","add","adc","sbc","rsc","tst","teq","cmp","cmn","orr","mov","bic","mvn" }; -char setc[32] = {0,115,0,115,0,115,0,115,0,115,0,115,0,115,0,115,0, 0 ,0, 0 ,0, 0 ,0, 0 ,0,115,0,115,0,115,0,115 }; -char *regs[16] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "sl", "fp", "ip", "sp", "lr", "pc" }; - -char *shfts[4] = { "lsl", "lsr", "asr", "ror" }; - -/* -31-28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 -Cond 0 0 I ---Opcode--- S |----Rn----- ----Rd----- --------Operand 2-------- Data Processing /PSR Transfer -Cond 0 0 0 0 | 0 0 A S |----Rd----- ----Rn----- ---Rs---- 1 0 0 1 --Rm--- Multiply -Cond 0 0 0 0 | 1 U A S |---RdHi---- ---RdLo---- ---Rn---- 1 0 0 1 --Rm--- Multiply Long -Cond 0 0 0 1 | 0 B 0 0 |----Rn----- ----Rd----- 0 0 0 0 1 0 0 1 --Rm--- Single Data Swap -Cond 0 0 0 1 | 0 0 1 0 |1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 1 --Rn--- Branch and Exchange -Cond 0 0 0 P | U 0 W L |----Rn----- ----Rd----- 0 0 0 0 1 S H 1 --Rm--- Halfword Data Transfer: register offset -Cond 0 0 0 P | U 1 W L |----Rn----- ----Rd----- --Offset- 1 S H 1 -Offset Halfword Data Transfer: immediate offset -Cond 0 1 I P | U B W L |----Rn----- ----Rd----- --------Offset----------- Single Data Transfer -Cond 0 1 1 1 | x x x x |x x x x x x x x x x x x x x x 1 x x x x Undefined -Cond 1 0 0 P | U S W L |----Rn----- -----------Register List------------- Block Data Transfer -Cond 1 0 1 L | -------------------------Offset------------------------------ Branch -Cond 1 1 0 P | U N W L |----Rn----- ----CRd---- ---CP#--- -----Offset---- Coprocessor Data Transfer -Cond 1 1 1 0 | --CP Opc---|----CRn---- ----CRd---- ---CP#--- -CP-- 0 --CRm-- Coprocessor Data Operation -Cond 1 1 1 0 | CP Opc L |----CRn---- ----Rd----- ---CP#--- -CP-- 1 --CRm-- Coprocessor Register Transfer -Cond 1 1 1 1 | x x x x |x x x x x x x x x x x x x x x x x x x x Software Interrupt - -0x04200000 -0001 0 0 0 0 0 1 1 0 6 e 1 1 1 0 1 8 -================================================================================ -Cond 0 1 I P | U B W L |----Rn----- ----Rd----- --------Offset----------- Single Data Transfer - - -EQ 0 Z set equal -NE 1 Z clear not equal -CS 2 C set unsigned higher or same -CC 3 C clear unsigned lower -MI 4 N set negative -PL 5 N clear positive or zero -VS 6 V set overflow -VC 7 V clear no overflow -HI 8 C set and Z clear unsigned higher -LS 9 C clear or Z set unsigned lower or same -GE A N equals V greater or equal -LT B N not equal to V less than -GT C Z clear AND (N equals V) greater than -LE D Z set OR (N not equal to V) less than or equal -AL E (ignored) always - -AND 0 operand1 AND operand2 -EOR 1 operand1 EOR operand2 -SUB 2 operand1 - operand2 -RSB 3 operand2 - operand1 -ADD 4 operand1 + operand2 -ADC 5 operand1 + operand2 + carry -SBC 6 operand1 - operand2 + carry - 1 -RSC 7 operand2 - operand1 + carry - 1 -TST 8 AND, but result is not written -TEQ 9 as EOR, but result is not written -CMP A as SUB, but result is not written -CMN B as ADD, but result is not written -ORR C operand1 OR operand2 -MOV D operand2 (operand1 is ignored) -BIC E operand1 AND NOT operand2 (Bit clear) -MVN F NOT operand2 (operand1 is ignored) -*/ - -void multiply_stg(char *stg, ULONG val) -{ - if((val&0xc00000) == 0) // simple mul - { - if(val & 0x100000) // set condition flags - if(val & 0x200000) sprintf(stg+strlen(stg), "mla%ss ", cond[val>>28]); - else sprintf(stg+strlen(stg), "mul%ss ", cond[val>>28]); - else - if(val & 0x200000) sprintf(stg+strlen(stg), "mla%s ", cnd1[val>>28]); - else sprintf(stg+strlen(stg), "mul%s ", cnd1[val>>28]); - - if(val & 0x200000) // accumulate - sprintf(stg+strlen(stg), "%s, %s, %s, %s", regs[(val>>16)&15], regs[(val>>0)&15], regs[(val>>8)&15], regs[(val>>12)&15]); - else - sprintf(stg+strlen(stg), "%s, %s, %s", regs[(val>>16)&15], regs[(val>>0)&15], regs[(val>>8)&15]); - } - else - { - if(val & 0x100000) // set condition flags - if(val & 0x200000) // accumulate - if(val & 0x400000) sprintf(stg+strlen(stg), "smlal%ss ", cond[val>>28]); - else sprintf(stg+strlen(stg), "umlal%ss ", cond[val>>28]); - else - if(val & 0x400000) sprintf(stg+strlen(stg), "smull%ss ", cond[val>>28]); - else sprintf(stg+strlen(stg), "umull%ss ", cond[val>>28]); - else - if(val & 0x200000) - if(val & 0x400000) sprintf(stg+strlen(stg), "smlal%s ", cond[val>>28]); - else sprintf(stg+strlen(stg), "umlal%s ", cond[val>>28]); - else - if(val & 0x400000) sprintf(stg+strlen(stg), "smull%s ", cond[val>>28]); - else sprintf(stg+strlen(stg), "umull%s ", cond[val>>28]); - - sprintf(stg+strlen(stg), "%s, %s, %s, %s", regs[(val>>12)&15], regs[(val>>16)&15], regs[(val>>0)&15], regs[(val>>8)&15]); - } -} - -void halfword_stg(char *stg, ULONG val) -{ - ULONG off = ((val>>4) & 0xf0) + (val & 0x0f); - - if(val & 0x100000) sprintf(stg+strlen(stg), "ldr%s", cond[val>>28]); - else sprintf(stg+strlen(stg), "str%s", cond[val>>28]); - - switch((val>>5) & 3) // SWP, HW, SB, SH - { - case 0: sprintf(stg+strlen(stg), "error: SWP"); break; - case 1: sprintf(stg+strlen(stg), "h "); break; - case 2: sprintf(stg+strlen(stg), "sb "); break; - case 3: sprintf(stg+strlen(stg), "sh "); break; - } - - if(val & 0x400000) // immidiate offset - if(val & 0x1000000) // pre index - if(val & 0x200000) // write back - if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s, "FRMT"]!", regs[(val>>12)&15], regs[(val>>16)&15], off); - else sprintf(stg+strlen(stg), "%s, [%s, -"FRMT"]!", regs[(val>>12)&15], regs[(val>>16)&15], off); - else - if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s, "FRMT"]", regs[(val>>12)&15], regs[(val>>16)&15], off); - else sprintf(stg+strlen(stg), "%s, [%s, -"FRMT"]", regs[(val>>12)&15], regs[(val>>16)&15], off); - else - if(val & 0x200000) // write back - sprintf(stg+strlen(stg), "error 'write back' on post indexed"); - else - if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s], "FRMT, regs[(val>>12)&15], regs[(val>>16)&15], off); - else sprintf(stg+strlen(stg), "%s, [%s], -"FRMT, regs[(val>>12)&15], regs[(val>>16)&15], off); - else - if(val & 0x1000000) // pre index - if(val & 0x200000) // write back - if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s, %s]!", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); - else sprintf(stg+strlen(stg), "%s, [%s, -%s]!", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); - else - if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s, %s]", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); - else sprintf(stg+strlen(stg), "%s, [%s, -%s]", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); - else - if(val & 0x200000) // write back - sprintf(stg+strlen(stg), "error 'write back' on post indexed"); - else - if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s], %s", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); - else sprintf(stg+strlen(stg), "%s, [%s], -%s", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); -} - -void branch_stg(char *stg, ULONG val, ULONG pos) -{ - ULONG off = pos + (((int32_t)val << 8) >> 6) + 8; - - if((val & 0x0ffffff0) == 0x012fff10) // bx instruction - { sprintf(stg+strlen(stg), "bx%s %s", cond[val>>28], regs[val&15]); } - else - { - if(((val>>24)&15) == 10) sprintf(stg+strlen(stg), "b%s ", cond[val>>28]); - else sprintf(stg+strlen(stg), "bl%s ", cond[val>>28]); - - sprintf(stg+strlen(stg), "0x%x", off); - } -} - -void opcode_stg(char *stg, ULONG val, ULONG off) -{ - ULONG des, op1; - char op2[80]; - char *st = stg + strlen(stg); - - if(((val & 0x0ffffff0) == 0x012fff10) && (val & 16)) - { branch_stg(stg, val, off); return; } - else if(((val & 0x0f000000) == 0x00000000) && ((val & 0xf0) == 0x90)) - { multiply_stg(stg, val); return; } - else if(((val & 0x0f000000) <= 0x01000000) && ((val & 0x90) == 0x90) && ((val & 0xf0) > 0x90) && ((val & 0x01200000) != 0x00200000)) - { halfword_stg(stg, val); return; } - - sprintf(stg+strlen(stg), "%s%s%s ", opcd[(val>>21) & 15], cond[val>>28], setc[(val>>20) & 31]?"s":" "); - - des = (val>>12) & 15; - op1 = (val>>16) & 15; - - if(val & 0x2000000) // immidiate - { - off = (ULONG)((uint64_t)(val&0xff) << (32 - 2 * ((val >> 8) & 15))) | ((val&0xff) >> 2 * ((val >> 8) & 15)); - sprintf(op2, FRMT" ", off); - } - else - { - if(val & 16) // shift type - sprintf(op2, SHFTFRMR, regs[val&15], shfts[(val>>5)&3], regs[(val>>8)&15]); - else - if((val>>7) & 31) - sprintf(op2, SHFTFRMC, regs[val&15], shfts[(val>>5)&3], (val>>7) & 31); - else - sprintf(op2, "%s ", regs[val&15]); - } - - switch((val>>21) & 15) - { - case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 12: - case 14: sprintf(stg+strlen(stg), "%s, %s, %s", regs[des], regs[op1], op2); break; - - case 8: case 9: case 10: - case 11: if(val & 0x100000) // set status - sprintf(stg+strlen(stg), "%s, %s", regs[op1], op2); // standard TEQ,TST,CMP,CMN - else - { //special MRS/MSR opcodes - if((((val>>23) & 31) == 2) && ((val & 0x3f0fff) == 0x0f0000)) - { sprintf(st, "mrs%s %s, %s", cnd1[val>>28], regs[des], val&0x400000?"SPSR_xx":"CPSR"); } - else - if((((val>>23) & 31) == 2) && ((val & 0x30fff0) == 0x20f000)) - { sprintf(st, "msr%s %s, %s", cnd1[val>>28], val&0x400000?"SPSR_xx":"CPSR", regs[val&15]); } - else - if((((val>>23) & 31) == 6) && ((val & 0x30f000) == 0x20f000)) - { sprintf(st, "msr%s %s, %s", cnd1[val>>28], val&0x400000?"SPSR_xx":"CPSR_cf", op2); } - else - if((((val>>23) & 31) == 2) && ((val & 0x300ff0) == 0x000090)) - { sprintf(st, "swp%s%s %s, %s, [%s]", val&0x400000?"b":"", cnd1[val>>28], regs[(val>>12)&15], regs[val&15], regs[(val>>16)&15]); } - else - { sprintf(stg+strlen(stg), "??????????????"); } - } break; - case 13: - case 15: sprintf(stg+strlen(stg), "%s, %s", regs[des], op2); break; - } -} - -void opcode_cop(char *stg, ULONG val, ULONG off) -{ - char* op; - int opcode1 = (val >> 21) & 0x7; - int CRn = (val >> 16) & 0xf; - int Rd = (val >> 12) & 0xf; - int cp_num = (val >> 8) & 0xf; - int opcode2 = (val >> 5) & 0x7; - int CRm = val & 0xf; - - -// ee073f5e mcr 15, 0, r3, cr7, cr14, {2} - - if (val & (1<<4)) { - if (val & (1<<20)) { - op = "mrc"; - } else { - op = "mcr"; - } - opcode1 = (val >> 21) & 0x7; - CRn = (val >> 16) & 0xf; - Rd = (val >> 12) & 0xf; - cp_num = (val >> 8) & 0xf; - opcode2 = (val >> 5) & 0x7; - CRm = val & 0xf; - - sprintf(stg+strlen(stg), "%s%s %d, %d, r%d, cr%d, cr%d, {%d}", op, cnd1[val>>28], cp_num, opcode1, Rd, CRn, CRm, opcode2); - } else { - op = "cdp"; - - opcode1 = (val >> 20) & 0xf; - CRn = (val >> 16) & 0xf; - Rd = (val >> 12) & 0xf; - cp_num = (val >> 8) & 0xf; - opcode2 = (val >> 5) & 0x7; - CRm = val & 0xf; - - sprintf(stg+strlen(stg), "%s%s %d, %d, cr%d, cr%d, cr%d, {%d}", op, cnd1[val>>28], cp_num, opcode1, Rd, CRn, CRm, opcode2); - } - -} - - -void single_data(char *stg, ULONG val) -{ - char op2[80]; - - if(((val & 0x0e000000) == 0x06000000) && (val & 16)) - { sprintf(stg+strlen(stg), "undef%s", cond[val>>28]); - return; - } - - if(val & 0x400000) - if(val & 0x100000) sprintf(stg+strlen(stg), "ldr%sb ", cond[val>>28]); - else sprintf(stg+strlen(stg), "str%sb ", cond[val>>28]); - else - if(val & 0x100000) sprintf(stg+strlen(stg), "ldr%s ", cnd1[val>>28]); - else sprintf(stg+strlen(stg), "str%s ", cnd1[val>>28]); - - if(val & 0x2000000) {// reg offset - if(val & 16) // shift type - sprintf(op2, "error: reg defined shift"); - else - if((val>>7) & 31) - sprintf(op2, SHFTFRMC, regs[val&15], shfts[(val>>5)&3], (val>>7) & 31); - else - sprintf(op2, "%s", regs[val&15]); - } - - if(val & 0x2000000) // reg offset - if(val & 0x1000000) // pre index - if(val & 0x800000) // up offset (+) - if(val & 0x200000) // write back - sprintf(stg+strlen(stg), "%s, [%s, %s]!", regs[(val>>12)&15], regs[(val>>16)&15], op2); - else - sprintf(stg+strlen(stg), "%s, [%s, %s]", regs[(val>>12)&15], regs[(val>>16)&15], op2); - else - if(val & 0x200000) // write back - sprintf(stg+strlen(stg), "%s, [%s, -%s]!", regs[(val>>12)&15], regs[(val>>16)&15], op2); - else - sprintf(stg+strlen(stg), "%s, [%s, -%s]", regs[(val>>12)&15], regs[(val>>16)&15], op2); - else - if(val & 0x200000) // write back - sprintf(stg+strlen(stg), "error 'write back' set"); - else - if(val & 0x800000) // up offset (+) - sprintf(stg+strlen(stg), "%s, [%s], %s", regs[(val>>12)&15], regs[(val>>16)&15], op2); - else - sprintf(stg+strlen(stg), "%s, [%s], -%s", regs[(val>>12)&15], regs[(val>>16)&15], op2); - else - if(val & 0x1000000) // pre index - if(val & 0x800000) // up offset (+) - if(val & 0x200000) // write back - if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s, "FRMT"]!", regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); - else sprintf(stg+strlen(stg), "%s, [%s]!", regs[(val>>12)&15], regs[(val>>16)&15]); - else - if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s, "FRMT"]", regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); - else sprintf(stg+strlen(stg), "%s, [%s]", regs[(val>>12)&15], regs[(val>>16)&15]); - else - if(val & 0x200000) // write back - if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s, -"FRMT"]!", regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); - else sprintf(stg+strlen(stg), "%s, [%s]!", regs[(val>>12)&15], regs[(val>>16)&15]); - else - if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s, -"FRMT"]", regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); - else sprintf(stg+strlen(stg), "%s, [%s]", regs[(val>>12)&15], regs[(val>>16)&15]); - else - if(val & 0x200000) // write back - sprintf(stg+strlen(stg), "error 'write back' set"); - else - if(val & 0x800000) // up offset (+) - if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s], "FRMT, regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); - else sprintf(stg+strlen(stg), "%s, [%s]", regs[(val>>12)&15], regs[(val>>16)&15]); - else - if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s], -"FRMT, regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); - else sprintf(stg+strlen(stg), "%s, [%s]", regs[(val>>12)&15], regs[(val>>16)&15]); -} - -void block_data(char *stg, ULONG val) -{ - char lst[80]; - int i; - - strcpy(lst, "{"); - for(i=0; i<16; i++) - if(val & (1<2) - strcpy(lst+strlen(lst)-2, "}"); - else - strcpy(lst+strlen(lst), "}"); - - if(val & 0x400000) // load psr or force user mode - strcpy(lst+strlen(lst), "^"); - - - if(val & 0x100000) // load - if(val & 0x1000000) // pre offset - if(val & 0x800000) sprintf(stg+strlen(stg), "ldm%sib ", cond[val>>28]); - else sprintf(stg+strlen(stg), "ldm%sdb ", cond[val>>28]); - else - if(val & 0x800000) sprintf(stg+strlen(stg), "ldm%sia ", cond[val>>28]); - else sprintf(stg+strlen(stg), "ldm%sda ", cond[val>>28]); - else - if(val & 0x1000000) - if(val & 0x800000) sprintf(stg+strlen(stg), "stm%sib ", cond[val>>28]); - else sprintf(stg+strlen(stg), "stm%sdb ", cond[val>>28]); - else - if(val & 0x800000) sprintf(stg+strlen(stg), "stm%sia ", cond[val>>28]); - else sprintf(stg+strlen(stg), "stm%sda ", cond[val>>28]); - - switch((val>>21)&3) - { - case 0: sprintf(stg+strlen(stg), "%s, %s", regs[(val>>16)&15], lst); break; - case 1: sprintf(stg+strlen(stg), "%s!, %s", regs[(val>>16)&15], lst); break; - case 2: sprintf(stg+strlen(stg), "%s, %s", regs[(val>>16)&15], lst); break; - case 3: sprintf(stg+strlen(stg), "%s!, %s", regs[(val>>16)&15], lst); break; - } -} - -void dis_asm(ULONG off, ULONG val, char *stg) -{ - sprintf(stg, "%6x: %08x ", off, val); - - switch((val >> 24) & 15) - { - case 0: - case 1: - case 2: - case 3: opcode_stg(stg, val, off); break; - case 4: - case 5: - case 6: - case 7: single_data(stg, val); break; - case 8: - case 9: block_data(stg, val); break; - case 10: - case 11: branch_stg(stg, val, off); break; - case 12: - case 13: sprintf(stg+strlen(stg), "cop%s", cnd1[val>>28]); break; - case 14: opcode_cop(stg, val, off); break; - case 15: sprintf(stg+strlen(stg), "swi%s", cnd1[val>>28]); break; - } -} +#include +#include +#include + +#define ULONG uint32_t +#define UCHAR uint8_t + +#define FRMT "0x%x" // "0x%x" +#define SHFTFRMC "%s %s #%d" // "%s %s %d" +#define SHFTFRMR "%s %s %s" // "%s %s %s" +//#define FRMT "0x%x" +//#define SHFTFRMC "%s %s %d" +//#define SHFTFRMR "%s %s %s" + +char *cond[16] = { "eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", "hi", "ls", "ge", "lt", "gt", "le", "", "nv" }; +char *cnd1[16] = { "eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", "hi", "ls", "ge", "lt", "gt", "le", " ", "nv" }; +char *opcd[16] = {"and","eor","sub","rsb","add","adc","sbc","rsc","tst","teq","cmp","cmn","orr","mov","bic","mvn" }; +char setc[32] = {0,115,0,115,0,115,0,115,0,115,0,115,0,115,0,115,0, 0 ,0, 0 ,0, 0 ,0, 0 ,0,115,0,115,0,115,0,115 }; +char *regs[16] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "sl", "fp", "ip", "sp", "lr", "pc" }; + +char *shfts[4] = { "lsl", "lsr", "asr", "ror" }; + +/* +31-28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 +Cond 0 0 I ---Opcode--- S |----Rn----- ----Rd----- --------Operand 2-------- Data Processing /PSR Transfer +Cond 0 0 0 0 | 0 0 A S |----Rd----- ----Rn----- ---Rs---- 1 0 0 1 --Rm--- Multiply +Cond 0 0 0 0 | 1 U A S |---RdHi---- ---RdLo---- ---Rn---- 1 0 0 1 --Rm--- Multiply Long +Cond 0 0 0 1 | 0 B 0 0 |----Rn----- ----Rd----- 0 0 0 0 1 0 0 1 --Rm--- Single Data Swap +Cond 0 0 0 1 | 0 0 1 0 |1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 1 --Rn--- Branch and Exchange +Cond 0 0 0 P | U 0 W L |----Rn----- ----Rd----- 0 0 0 0 1 S H 1 --Rm--- Halfword Data Transfer: register offset +Cond 0 0 0 P | U 1 W L |----Rn----- ----Rd----- --Offset- 1 S H 1 -Offset Halfword Data Transfer: immediate offset +Cond 0 1 I P | U B W L |----Rn----- ----Rd----- --------Offset----------- Single Data Transfer +Cond 0 1 1 1 | x x x x |x x x x x x x x x x x x x x x 1 x x x x Undefined +Cond 1 0 0 P | U S W L |----Rn----- -----------Register List------------- Block Data Transfer +Cond 1 0 1 L | -------------------------Offset------------------------------ Branch +Cond 1 1 0 P | U N W L |----Rn----- ----CRd---- ---CP#--- -----Offset---- Coprocessor Data Transfer +Cond 1 1 1 0 | --CP Opc---|----CRn---- ----CRd---- ---CP#--- -CP-- 0 --CRm-- Coprocessor Data Operation +Cond 1 1 1 0 | CP Opc L |----CRn---- ----Rd----- ---CP#--- -CP-- 1 --CRm-- Coprocessor Register Transfer +Cond 1 1 1 1 | x x x x |x x x x x x x x x x x x x x x x x x x x Software Interrupt + +0x04200000 +0001 0 0 0 0 0 1 1 0 6 e 1 1 1 0 1 8 +================================================================================ +Cond 0 1 I P | U B W L |----Rn----- ----Rd----- --------Offset----------- Single Data Transfer + + +EQ 0 Z set equal +NE 1 Z clear not equal +CS 2 C set unsigned higher or same +CC 3 C clear unsigned lower +MI 4 N set negative +PL 5 N clear positive or zero +VS 6 V set overflow +VC 7 V clear no overflow +HI 8 C set and Z clear unsigned higher +LS 9 C clear or Z set unsigned lower or same +GE A N equals V greater or equal +LT B N not equal to V less than +GT C Z clear AND (N equals V) greater than +LE D Z set OR (N not equal to V) less than or equal +AL E (ignored) always + +AND 0 operand1 AND operand2 +EOR 1 operand1 EOR operand2 +SUB 2 operand1 - operand2 +RSB 3 operand2 - operand1 +ADD 4 operand1 + operand2 +ADC 5 operand1 + operand2 + carry +SBC 6 operand1 - operand2 + carry - 1 +RSC 7 operand2 - operand1 + carry - 1 +TST 8 AND, but result is not written +TEQ 9 as EOR, but result is not written +CMP A as SUB, but result is not written +CMN B as ADD, but result is not written +ORR C operand1 OR operand2 +MOV D operand2 (operand1 is ignored) +BIC E operand1 AND NOT operand2 (Bit clear) +MVN F NOT operand2 (operand1 is ignored) +*/ + +void multiply_stg(char *stg, ULONG val) +{ + if((val&0xc00000) == 0) // simple mul + { + if(val & 0x100000) // set condition flags + if(val & 0x200000) sprintf(stg+strlen(stg), "mla%ss ", cond[val>>28]); + else sprintf(stg+strlen(stg), "mul%ss ", cond[val>>28]); + else + if(val & 0x200000) sprintf(stg+strlen(stg), "mla%s ", cnd1[val>>28]); + else sprintf(stg+strlen(stg), "mul%s ", cnd1[val>>28]); + + if(val & 0x200000) // accumulate + sprintf(stg+strlen(stg), "%s, %s, %s, %s", regs[(val>>16)&15], regs[(val>>0)&15], regs[(val>>8)&15], regs[(val>>12)&15]); + else + sprintf(stg+strlen(stg), "%s, %s, %s", regs[(val>>16)&15], regs[(val>>0)&15], regs[(val>>8)&15]); + } + else + { + if(val & 0x100000) // set condition flags + if(val & 0x200000) // accumulate + if(val & 0x400000) sprintf(stg+strlen(stg), "smlal%ss ", cond[val>>28]); + else sprintf(stg+strlen(stg), "umlal%ss ", cond[val>>28]); + else + if(val & 0x400000) sprintf(stg+strlen(stg), "smull%ss ", cond[val>>28]); + else sprintf(stg+strlen(stg), "umull%ss ", cond[val>>28]); + else + if(val & 0x200000) + if(val & 0x400000) sprintf(stg+strlen(stg), "smlal%s ", cond[val>>28]); + else sprintf(stg+strlen(stg), "umlal%s ", cond[val>>28]); + else + if(val & 0x400000) sprintf(stg+strlen(stg), "smull%s ", cond[val>>28]); + else sprintf(stg+strlen(stg), "umull%s ", cond[val>>28]); + + sprintf(stg+strlen(stg), "%s, %s, %s, %s", regs[(val>>12)&15], regs[(val>>16)&15], regs[(val>>0)&15], regs[(val>>8)&15]); + } +} + +void halfword_stg(char *stg, ULONG val) +{ + ULONG off = ((val>>4) & 0xf0) + (val & 0x0f); + + if(val & 0x100000) sprintf(stg+strlen(stg), "ldr%s", cond[val>>28]); + else sprintf(stg+strlen(stg), "str%s", cond[val>>28]); + + switch((val>>5) & 3) // SWP, HW, SB, SH + { + case 0: sprintf(stg+strlen(stg), "error: SWP"); break; + case 1: sprintf(stg+strlen(stg), "h "); break; + case 2: sprintf(stg+strlen(stg), "sb "); break; + case 3: sprintf(stg+strlen(stg), "sh "); break; + } + + if(val & 0x400000) // immidiate offset + if(val & 0x1000000) // pre index + if(val & 0x200000) // write back + if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s, "FRMT"]!", regs[(val>>12)&15], regs[(val>>16)&15], off); + else sprintf(stg+strlen(stg), "%s, [%s, -"FRMT"]!", regs[(val>>12)&15], regs[(val>>16)&15], off); + else + if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s, "FRMT"]", regs[(val>>12)&15], regs[(val>>16)&15], off); + else sprintf(stg+strlen(stg), "%s, [%s, -"FRMT"]", regs[(val>>12)&15], regs[(val>>16)&15], off); + else + if(val & 0x200000) // write back + sprintf(stg+strlen(stg), "error 'write back' on post indexed"); + else + if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s], "FRMT, regs[(val>>12)&15], regs[(val>>16)&15], off); + else sprintf(stg+strlen(stg), "%s, [%s], -"FRMT, regs[(val>>12)&15], regs[(val>>16)&15], off); + else + if(val & 0x1000000) // pre index + if(val & 0x200000) // write back + if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s, %s]!", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); + else sprintf(stg+strlen(stg), "%s, [%s, -%s]!", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); + else + if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s, %s]", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); + else sprintf(stg+strlen(stg), "%s, [%s, -%s]", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); + else + if(val & 0x200000) // write back + sprintf(stg+strlen(stg), "error 'write back' on post indexed"); + else + if(val & 0x800000) sprintf(stg+strlen(stg), "%s, [%s], %s", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); + else sprintf(stg+strlen(stg), "%s, [%s], -%s", regs[(val>>12)&15], regs[(val>>16)&15], regs[val&15]); +} + +void branch_stg(char *stg, ULONG val, ULONG pos) +{ + ULONG off = pos + (((int32_t)val << 8) >> 6) + 8; + + if((val & 0x0ffffff0) == 0x012fff10) // bx instruction + { sprintf(stg+strlen(stg), "bx%s %s", cond[val>>28], regs[val&15]); } + else + { + if(((val>>24)&15) == 10) sprintf(stg+strlen(stg), "b%s ", cond[val>>28]); + else sprintf(stg+strlen(stg), "bl%s ", cond[val>>28]); + + sprintf(stg+strlen(stg), "0x%x", off); + } +} + +void opcode_stg(char *stg, ULONG val, ULONG off) +{ + ULONG des, op1; + char op2[80]; + char *st = stg + strlen(stg); + + if(((val & 0x0ffffff0) == 0x012fff10) && (val & 16)) + { branch_stg(stg, val, off); return; } + else if(((val & 0x0f000000) == 0x00000000) && ((val & 0xf0) == 0x90)) + { multiply_stg(stg, val); return; } + else if(((val & 0x0f000000) <= 0x01000000) && ((val & 0x90) == 0x90) && ((val & 0xf0) > 0x90) && ((val & 0x01200000) != 0x00200000)) + { halfword_stg(stg, val); return; } + + sprintf(stg+strlen(stg), "%s%s%s ", opcd[(val>>21) & 15], cond[val>>28], setc[(val>>20) & 31]?"s":" "); + + des = (val>>12) & 15; + op1 = (val>>16) & 15; + + if(val & 0x2000000) // immidiate + { + off = (ULONG)((uint64_t)(val&0xff) << (32 - 2 * ((val >> 8) & 15))) | ((val&0xff) >> 2 * ((val >> 8) & 15)); + sprintf(op2, FRMT" ", off); + } + else + { + if(val & 16) // shift type + sprintf(op2, SHFTFRMR, regs[val&15], shfts[(val>>5)&3], regs[(val>>8)&15]); + else + if((val>>7) & 31) + sprintf(op2, SHFTFRMC, regs[val&15], shfts[(val>>5)&3], (val>>7) & 31); + else + sprintf(op2, "%s ", regs[val&15]); + } + + switch((val>>21) & 15) + { + case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 12: + case 14: sprintf(stg+strlen(stg), "%s, %s, %s", regs[des], regs[op1], op2); break; + + case 8: case 9: case 10: + case 11: if(val & 0x100000) // set status + sprintf(stg+strlen(stg), "%s, %s", regs[op1], op2); // standard TEQ,TST,CMP,CMN + else + { //special MRS/MSR opcodes + if((((val>>23) & 31) == 2) && ((val & 0x3f0fff) == 0x0f0000)) + { sprintf(st, "mrs%s %s, %s", cnd1[val>>28], regs[des], val&0x400000?"SPSR_xx":"CPSR"); } + else + if((((val>>23) & 31) == 2) && ((val & 0x30fff0) == 0x20f000)) + { sprintf(st, "msr%s %s, %s", cnd1[val>>28], val&0x400000?"SPSR_xx":"CPSR", regs[val&15]); } + else + if((((val>>23) & 31) == 6) && ((val & 0x30f000) == 0x20f000)) + { sprintf(st, "msr%s %s, %s", cnd1[val>>28], val&0x400000?"SPSR_xx":"CPSR_cf", op2); } + else + if((((val>>23) & 31) == 2) && ((val & 0x300ff0) == 0x000090)) + { sprintf(st, "swp%s%s %s, %s, [%s]", val&0x400000?"b":"", cnd1[val>>28], regs[(val>>12)&15], regs[val&15], regs[(val>>16)&15]); } + else + { sprintf(stg+strlen(stg), "??????????????"); } + } break; + case 13: + case 15: sprintf(stg+strlen(stg), "%s, %s", regs[des], op2); break; + } +} + +void opcode_cop(char *stg, ULONG val, ULONG off) +{ + char* op; + int opcode1 = (val >> 21) & 0x7; + int CRn = (val >> 16) & 0xf; + int Rd = (val >> 12) & 0xf; + int cp_num = (val >> 8) & 0xf; + int opcode2 = (val >> 5) & 0x7; + int CRm = val & 0xf; + + +// ee073f5e mcr 15, 0, r3, cr7, cr14, {2} + + if (val & (1<<4)) { + if (val & (1<<20)) { + op = "mrc"; + } else { + op = "mcr"; + } + opcode1 = (val >> 21) & 0x7; + CRn = (val >> 16) & 0xf; + Rd = (val >> 12) & 0xf; + cp_num = (val >> 8) & 0xf; + opcode2 = (val >> 5) & 0x7; + CRm = val & 0xf; + + sprintf(stg+strlen(stg), "%s%s %d, %d, r%d, cr%d, cr%d, {%d}", op, cnd1[val>>28], cp_num, opcode1, Rd, CRn, CRm, opcode2); + } else { + op = "cdp"; + + opcode1 = (val >> 20) & 0xf; + CRn = (val >> 16) & 0xf; + Rd = (val >> 12) & 0xf; + cp_num = (val >> 8) & 0xf; + opcode2 = (val >> 5) & 0x7; + CRm = val & 0xf; + + sprintf(stg+strlen(stg), "%s%s %d, %d, cr%d, cr%d, cr%d, {%d}", op, cnd1[val>>28], cp_num, opcode1, Rd, CRn, CRm, opcode2); + } + +} + + +void single_data(char *stg, ULONG val) +{ + char op2[80]; + + if(((val & 0x0e000000) == 0x06000000) && (val & 16)) + { sprintf(stg+strlen(stg), "undef%s", cond[val>>28]); + return; + } + + if(val & 0x400000) + if(val & 0x100000) sprintf(stg+strlen(stg), "ldr%sb ", cond[val>>28]); + else sprintf(stg+strlen(stg), "str%sb ", cond[val>>28]); + else + if(val & 0x100000) sprintf(stg+strlen(stg), "ldr%s ", cnd1[val>>28]); + else sprintf(stg+strlen(stg), "str%s ", cnd1[val>>28]); + + if(val & 0x2000000) {// reg offset + if(val & 16) // shift type + sprintf(op2, "error: reg defined shift"); + else + if((val>>7) & 31) + sprintf(op2, SHFTFRMC, regs[val&15], shfts[(val>>5)&3], (val>>7) & 31); + else + sprintf(op2, "%s", regs[val&15]); + } + + if(val & 0x2000000) // reg offset + if(val & 0x1000000) // pre index + if(val & 0x800000) // up offset (+) + if(val & 0x200000) // write back + sprintf(stg+strlen(stg), "%s, [%s, %s]!", regs[(val>>12)&15], regs[(val>>16)&15], op2); + else + sprintf(stg+strlen(stg), "%s, [%s, %s]", regs[(val>>12)&15], regs[(val>>16)&15], op2); + else + if(val & 0x200000) // write back + sprintf(stg+strlen(stg), "%s, [%s, -%s]!", regs[(val>>12)&15], regs[(val>>16)&15], op2); + else + sprintf(stg+strlen(stg), "%s, [%s, -%s]", regs[(val>>12)&15], regs[(val>>16)&15], op2); + else + if(val & 0x200000) // write back + sprintf(stg+strlen(stg), "error 'write back' set"); + else + if(val & 0x800000) // up offset (+) + sprintf(stg+strlen(stg), "%s, [%s], %s", regs[(val>>12)&15], regs[(val>>16)&15], op2); + else + sprintf(stg+strlen(stg), "%s, [%s], -%s", regs[(val>>12)&15], regs[(val>>16)&15], op2); + else + if(val & 0x1000000) // pre index + if(val & 0x800000) // up offset (+) + if(val & 0x200000) // write back + if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s, "FRMT"]!", regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); + else sprintf(stg+strlen(stg), "%s, [%s]!", regs[(val>>12)&15], regs[(val>>16)&15]); + else + if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s, "FRMT"]", regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); + else sprintf(stg+strlen(stg), "%s, [%s]", regs[(val>>12)&15], regs[(val>>16)&15]); + else + if(val & 0x200000) // write back + if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s, -"FRMT"]!", regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); + else sprintf(stg+strlen(stg), "%s, [%s]!", regs[(val>>12)&15], regs[(val>>16)&15]); + else + if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s, -"FRMT"]", regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); + else sprintf(stg+strlen(stg), "%s, [%s]", regs[(val>>12)&15], regs[(val>>16)&15]); + else + if(val & 0x200000) // write back + sprintf(stg+strlen(stg), "error 'write back' set"); + else + if(val & 0x800000) // up offset (+) + if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s], "FRMT, regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); + else sprintf(stg+strlen(stg), "%s, [%s]", regs[(val>>12)&15], regs[(val>>16)&15]); + else + if(val & 0xfff) sprintf(stg+strlen(stg), "%s, [%s], -"FRMT, regs[(val>>12)&15], regs[(val>>16)&15], val & 0xfff); + else sprintf(stg+strlen(stg), "%s, [%s]", regs[(val>>12)&15], regs[(val>>16)&15]); +} + +void block_data(char *stg, ULONG val) +{ + char lst[80]; + int i; + + strcpy(lst, "{"); + for(i=0; i<16; i++) + if(val & (1<2) + strcpy(lst+strlen(lst)-2, "}"); + else + strcpy(lst+strlen(lst), "}"); + + if(val & 0x400000) // load psr or force user mode + strcpy(lst+strlen(lst), "^"); + + + if(val & 0x100000) // load + if(val & 0x1000000) // pre offset + if(val & 0x800000) sprintf(stg+strlen(stg), "ldm%sib ", cond[val>>28]); + else sprintf(stg+strlen(stg), "ldm%sdb ", cond[val>>28]); + else + if(val & 0x800000) sprintf(stg+strlen(stg), "ldm%sia ", cond[val>>28]); + else sprintf(stg+strlen(stg), "ldm%sda ", cond[val>>28]); + else + if(val & 0x1000000) + if(val & 0x800000) sprintf(stg+strlen(stg), "stm%sib ", cond[val>>28]); + else sprintf(stg+strlen(stg), "stm%sdb ", cond[val>>28]); + else + if(val & 0x800000) sprintf(stg+strlen(stg), "stm%sia ", cond[val>>28]); + else sprintf(stg+strlen(stg), "stm%sda ", cond[val>>28]); + + switch((val>>21)&3) + { + case 0: sprintf(stg+strlen(stg), "%s, %s", regs[(val>>16)&15], lst); break; + case 1: sprintf(stg+strlen(stg), "%s!, %s", regs[(val>>16)&15], lst); break; + case 2: sprintf(stg+strlen(stg), "%s, %s", regs[(val>>16)&15], lst); break; + case 3: sprintf(stg+strlen(stg), "%s!, %s", regs[(val>>16)&15], lst); break; + } +} + +void dis_asm(ULONG off, ULONG val, char *stg) +{ + sprintf(stg, "%6x: %08x ", off, val); + + switch((val >> 24) & 15) + { + case 0: + case 1: + case 2: + case 3: opcode_stg(stg, val, off); break; + case 4: + case 5: + case 6: + case 7: single_data(stg, val); break; + case 8: + case 9: block_data(stg, val); break; + case 10: + case 11: branch_stg(stg, val, off); break; + case 12: + case 13: sprintf(stg+strlen(stg), "cop%s", cnd1[val>>28]); break; + case 14: opcode_cop(stg, val, off); break; + case 15: sprintf(stg+strlen(stg), "swi%s", cnd1[val>>28]); break; + } +} diff --git a/utils/disassembler/arm/main.c b/utils/disassembler/arm/main.c index 0edc633785..674696405c 100644 --- a/utils/disassembler/arm/main.c +++ b/utils/disassembler/arm/main.c @@ -1,132 +1,132 @@ -#include -#include -#include -#include - -#define ULONG uint32_t -#define USHORT uint16_t -#define UCHAR uint8_t - -ULONG isdata[1000000]; /* each bit defines one byte as: code=0, data=1 */ - -extern void dis_asm(ULONG off, ULONG val, char *stg); - -int static inline le2int(unsigned char* buf) -{ - int32_t res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; - - return res; -} - -int main(int argc, char **argv) -{ - FILE *in, *out; - char *ptr, stg[256]; - unsigned char buf[4]; - ULONG pos, sz, val, loop; - int offset, offset1; - USHORT regid; - - if(argc == 1 || strcmp(argv[1], "--help") == 0) - { printf("Usage: arm_disass [input file]\n"); - printf(" disassembles input file to 'disasm.txt'\n"); - exit(-1); - } - - in = fopen(argv[1], "rb"); - if(in == NULL) - { printf("Cannot open %s", argv[1]); - exit(-1); - } - - out = fopen("disasm.txt", "w"); - if(out == NULL) exit(-1); - - fseek(in, 0, SEEK_END); - sz = ftell(in); - - /* first loop only sets data/code tags */ - for(loop=0; loop<2; loop++) - { - for(pos=0; pos assume data */ - if((isdata[pos>>5] & (0xf << (pos & 31))) || (val & 0xffff0000) == 0) - { - sprintf(stg, "%6x: %08x", pos, val); - } - else - { - dis_asm(pos, val, stg); - - /* check for instant mov operation */ - if(memcmp(stg+17, "mov ", 4) == 0 && (ptr=strstr(stg, "0x")) != NULL) - { - regid = *(USHORT*)(stg+22); - - sscanf(ptr+2, "%x", &offset); - if(ptr[-1] == '-') - offset = -offset; - } - else - /* check for add/sub operation */ - if((ptr=strstr(stg, "0x")) != NULL - && (memcmp(stg+17, "add ", 4) == 0 || memcmp(stg+17, "sub ", 4) == 0)) - { - if(regid == *(USHORT*)(stg+22) && regid == *(USHORT*)(stg+26)) - { - sscanf(ptr+2, "%x", &offset1); - if(ptr[-1] == '-') - offset1 = -offset1; - - if(memcmp(stg+17, "add ", 4) == 0) offset += offset1; - else offset -= offset1; - - /* add result to disassembler string */ - sprintf(stg+strlen(stg), " <- 0x%x", offset); - } - else - regid = 0; - } - else - regid = 0; - - /* check for const data */ - if(memcmp(stg+26, "[pc, ", 5) == 0 && (ptr=strstr(stg, "0x")) != NULL) - { - sscanf(ptr+2, "%x", &offset); - if(ptr[-1] == '-') - offset = -offset; - - /* add data tag */ - isdata[(pos+offset+8)>>5] |= 1 << ((pos+offset+8) & 31); - - /* add const data to disassembler string */ - fseek(in, pos+offset+8, SEEK_SET); - fread(&buf, 1, 4, in); - offset = le2int(buf); - - sprintf(stg+strlen(stg), " <- 0x%x", offset); - } - } - - /* remove trailing spaces */ - while(stg[strlen(stg)-1] == 32) - stg[strlen(stg)-1] = 0; - - if(loop == 1) - fprintf(out, "%s\n", stg); - } - } - - fclose(in); - return 0; -} +#include +#include +#include +#include + +#define ULONG uint32_t +#define USHORT uint16_t +#define UCHAR uint8_t + +ULONG isdata[1000000]; /* each bit defines one byte as: code=0, data=1 */ + +extern void dis_asm(ULONG off, ULONG val, char *stg); + +int static inline le2int(unsigned char* buf) +{ + int32_t res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; + + return res; +} + +int main(int argc, char **argv) +{ + FILE *in, *out; + char *ptr, stg[256]; + unsigned char buf[4]; + ULONG pos, sz, val, loop; + int offset, offset1; + USHORT regid; + + if(argc == 1 || strcmp(argv[1], "--help") == 0) + { printf("Usage: arm_disass [input file]\n"); + printf(" disassembles input file to 'disasm.txt'\n"); + exit(-1); + } + + in = fopen(argv[1], "rb"); + if(in == NULL) + { printf("Cannot open %s", argv[1]); + exit(-1); + } + + out = fopen("disasm.txt", "w"); + if(out == NULL) exit(-1); + + fseek(in, 0, SEEK_END); + sz = ftell(in); + + /* first loop only sets data/code tags */ + for(loop=0; loop<2; loop++) + { + for(pos=0; pos assume data */ + if((isdata[pos>>5] & (0xf << (pos & 31))) || (val & 0xffff0000) == 0) + { + sprintf(stg, "%6x: %08x", pos, val); + } + else + { + dis_asm(pos, val, stg); + + /* check for instant mov operation */ + if(memcmp(stg+17, "mov ", 4) == 0 && (ptr=strstr(stg, "0x")) != NULL) + { + regid = *(USHORT*)(stg+22); + + sscanf(ptr+2, "%x", &offset); + if(ptr[-1] == '-') + offset = -offset; + } + else + /* check for add/sub operation */ + if((ptr=strstr(stg, "0x")) != NULL + && (memcmp(stg+17, "add ", 4) == 0 || memcmp(stg+17, "sub ", 4) == 0)) + { + if(regid == *(USHORT*)(stg+22) && regid == *(USHORT*)(stg+26)) + { + sscanf(ptr+2, "%x", &offset1); + if(ptr[-1] == '-') + offset1 = -offset1; + + if(memcmp(stg+17, "add ", 4) == 0) offset += offset1; + else offset -= offset1; + + /* add result to disassembler string */ + sprintf(stg+strlen(stg), " <- 0x%x", offset); + } + else + regid = 0; + } + else + regid = 0; + + /* check for const data */ + if(memcmp(stg+26, "[pc, ", 5) == 0 && (ptr=strstr(stg, "0x")) != NULL) + { + sscanf(ptr+2, "%x", &offset); + if(ptr[-1] == '-') + offset = -offset; + + /* add data tag */ + isdata[(pos+offset+8)>>5] |= 1 << ((pos+offset+8) & 31); + + /* add const data to disassembler string */ + fseek(in, pos+offset+8, SEEK_SET); + fread(&buf, 1, 4, in); + offset = le2int(buf); + + sprintf(stg+strlen(stg), " <- 0x%x", offset); + } + } + + /* remove trailing spaces */ + while(stg[strlen(stg)-1] == 32) + stg[strlen(stg)-1] = 0; + + if(loop == 1) + fprintf(out, "%s\n", stg); + } + } + + fclose(in); + return 0; +} diff --git a/utils/jz4740_tools/HXFmerge.c b/utils/jz4740_tools/HXFmerge.c index 6b6c62505e..fdd81b8445 100644 --- a/utils/jz4740_tools/HXFmerge.c +++ b/utils/jz4740_tools/HXFmerge.c @@ -1,321 +1,321 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define VERSION "0.2" - -static unsigned char* int2le(unsigned int val) -{ - static unsigned char addr[4]; - addr[0] = val & 0xff; - addr[1] = (val >> 8) & 0xff; - addr[2] = (val >> 16) & 0xff; - addr[3] = (val >> 24) & 0xff; - return addr; -} - -static unsigned int le2int(unsigned char* buf) -{ - unsigned int res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; - - return res; -} - -#ifdef _WIN32 - #define PATH_SEPARATOR "\\" -#else - #define PATH_SEPARATOR "/" -#endif - -#ifndef _WIN32 - -#define MIN(a, b) (a > b ? b : a) -static char* replace(char* str) -{ - static char tmp[255]; - memcpy(tmp, str, MIN(strlen(str), 255)); - char *ptr = tmp; - while(*ptr != 0) - { - if(*ptr == 0x2F) /* /*/ - *ptr = 0x5C; /* \ */ - ptr++; - } - return tmp; -} -#endif - -static bool is_dir(const char* name1, const char* name2) -{ - char *name; - DIR *directory; - name = (char*)malloc(strlen(name1)+strlen(name2)+1); - strcpy(name, name1); - strcat(name, name2); - directory = opendir(name); - free(name); - if(directory) - { - closedir(directory); - return true; - } - else - return false; -} - -unsigned int _filesize(FILE* fd) -{ - unsigned int tmp, oldpos; - oldpos = ftell(fd); - fseek(fd, 0, SEEK_END); - tmp = ftell(fd); - fseek(fd, oldpos, SEEK_SET); - return tmp; -} -#define WRITE(x, len) if(fwrite(x, len, 1, outfile) != 1) \ - { \ - closedir(indir_handle); \ - if(filesize > 0) \ - free(buffer); \ - fprintf(stderr, "[ERR] Error writing to file\n"); \ - return; \ - } -static void merge_hxf(const char* indir, FILE* outfile, const char* add) -{ - DIR *indir_handle; - struct dirent *dirs; - char dir[255]; - strcpy(dir, indir); - strcat(dir, add); - - if((indir_handle = opendir(dir)) == NULL) - { - fprintf(stderr, "[ERR] Error opening dir %s\n", indir); - return; - } - - while((dirs = readdir(indir_handle)) != NULL) - { - if(strcmp(dirs->d_name, "..") != 0 && - strcmp(dirs->d_name, ".") != 0) - { - fprintf(stderr, "[INFO] %s\%s\n", add, dirs->d_name); - if(is_dir(dir, dirs->d_name)) - { - char dir2[255]; - strcpy(dir2, add); - strcat(dir2, dirs->d_name); - strcat(dir2, PATH_SEPARATOR); - merge_hxf(indir, outfile, dir2); - } - else - { - FILE *filehandle; - unsigned char *buffer; - char file[255]; - unsigned int filesize; - strcpy(file, dir); - strcat(file, dirs->d_name); - if((filehandle = fopen(file, "rb")) == NULL) - { - fprintf(stderr, "[ERR] Cannot open %s\n", file); - closedir(indir_handle); - return; - } - filesize = _filesize(filehandle); - if(filesize > 0) - { - buffer = (unsigned char*)malloc(filesize); - if(buffer == NULL) - { - fclose(filehandle); - closedir(indir_handle); - fprintf(stderr, "[ERR] Cannot allocate memory\n"); - return; - } - if(fread(buffer, filesize, 1, filehandle) != 1) - { - fclose(filehandle); - closedir(indir_handle); - free(buffer); - fprintf(stderr, "[ERR] Cannot read from %s%s%s\n", add, PATH_SEPARATOR, dirs->d_name); - return; - } - } - fclose(filehandle); - - if(strlen(add)>0) - { -#ifdef _DIRENT_HAVE_D_NAMLEN - WRITE(int2le(dirs->d_namlen+strlen(add)), 4); -#else - WRITE(int2le(strlen(dirs->d_name)+strlen(add)), 4); -#endif -#ifndef _WIN32 - WRITE(replace((char*)add), strlen(add)-1); -#else - WRITE(add, strlen(add)-1); -#endif - WRITE(PATH_SEPARATOR, 1); -#ifdef _DIRENT_HAVE_D_NAMLEN - WRITE(dirs->d_name, dirs->d_namlen); -#else - WRITE(dirs->d_name, strlen(dirs->d_name)); -#endif - } - else - { -#ifdef _DIRENT_HAVE_D_NAMLEN - WRITE(int2le(dirs->d_namlen), 4); - WRITE(dirs->d_name, dirs->d_namlen); -#else - WRITE(int2le(strlen(dirs->d_name)), 4); - WRITE(dirs->d_name, strlen(dirs->d_name)); -#endif - } - WRITE(int2le(filesize), 4); - if(filesize>0) - { - WRITE(buffer, filesize); - free(buffer); - } - } - } - } - closedir(indir_handle); -} - -static void print_usage(void) -{ -#ifdef _WIN32 - fprintf(stderr, "Usage: hxfmerge.exe [INPUT_DIR] [FW]\n\n"); - fprintf(stderr, "Example: hxfmerge.exe VX747_extracted\\ VX747.HXF\n\n"); -#else - fprintf(stderr, "Usage: HXFmerge [INPUT_DIR] [FW]\n\n"); - fprintf(stderr, "Example: HXFmerge VX747_extracted/ VX747.HXF\n\n"); -#endif -} - -static int checksum(FILE *file) -{ - int oldpos = ftell(file); - int ret=0, i, filesize = _filesize(file)-0x40; - unsigned char *buf; - - buf = (unsigned char*)malloc(filesize); - - if(buf == NULL) - { - fseek(file, oldpos, SEEK_SET); - fprintf(stderr, "[ERR] Error while allocating memory\n"); - return 0; - } - - fseek(file, 0x40, SEEK_SET); - if(fread(buf, filesize, 1, file) != 1) - { - free(buf); - fseek(file, oldpos, SEEK_SET); - fprintf(stderr, "[ERR] Error while reading from file\n"); - return 0; - } - - fprintf(stderr, "[INFO] Computing checksum..."); - - for(i = 0; i < filesize; i+=4) - ret += le2int(&buf[i]); - - free(buf); - fseek(file, oldpos, SEEK_SET); - - fprintf(stderr, " Done!\n"); - return ret; -} - -int main(int argc, char *argv[]) -{ - FILE *outfile; - - fprintf(stderr, "HXFmerge v" VERSION " - (C) 2008 Maurus Cuelenaere\n"); - fprintf(stderr, "This is free software; see the source for copying conditions. There is NO\n"); - fprintf(stderr, "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); - - if(argc != 3) - { - print_usage(); - return 1; - } - -#ifdef _WIN32 - if(strcmp((char*)(argv[1]+strlen(argv[1])-1), "\\") != 0) - { - fprintf(stderr, "[ERR] Input path must end with a \\\n"); -#else - if(strcmp((char*)(argv[1]+strlen(argv[1])-1), "/") != 0) - { - fprintf(stderr, "[ERR] Input path must end with a /\n"); -#endif - return 2; - } - - if((outfile = fopen(argv[2], "wb+")) == NULL) - { - fprintf(stderr, "[ERR] Cannot open %s\n", argv[2]); - return 3; - } - - fseek(outfile, 0x40, SEEK_SET); - - merge_hxf(argv[1], outfile, ""); - - fflush(outfile); - - fprintf(stderr, "[INFO] Filling header...\n"); - -#undef WRITE -#define WRITE(x, len) if(fwrite(x, len, 1, outfile) != 1) \ - { \ - fprintf(stderr, "[ERR] Cannot write to %s\n", argv[1]); \ - fclose(outfile); \ - return 4; \ - } - fflush(outfile); - fseek(outfile, 0, SEEK_SET); - WRITE("WADF0100200804111437", 20); - WRITE(int2le(_filesize(outfile)), 4); - WRITE(int2le(checksum(outfile)), 4); - WRITE(int2le(0), 4); - WRITE("Chinachip PMP firmware V1.0\0\0\0\0\0", 32); - fclose(outfile); - - fprintf(stderr, "[INFO] Done!\n"); - - return 0; -} +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 by Maurus Cuelenaere + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define VERSION "0.2" + +static unsigned char* int2le(unsigned int val) +{ + static unsigned char addr[4]; + addr[0] = val & 0xff; + addr[1] = (val >> 8) & 0xff; + addr[2] = (val >> 16) & 0xff; + addr[3] = (val >> 24) & 0xff; + return addr; +} + +static unsigned int le2int(unsigned char* buf) +{ + unsigned int res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; + + return res; +} + +#ifdef _WIN32 + #define PATH_SEPARATOR "\\" +#else + #define PATH_SEPARATOR "/" +#endif + +#ifndef _WIN32 + +#define MIN(a, b) (a > b ? b : a) +static char* replace(char* str) +{ + static char tmp[255]; + memcpy(tmp, str, MIN(strlen(str), 255)); + char *ptr = tmp; + while(*ptr != 0) + { + if(*ptr == 0x2F) /* /*/ + *ptr = 0x5C; /* \ */ + ptr++; + } + return tmp; +} +#endif + +static bool is_dir(const char* name1, const char* name2) +{ + char *name; + DIR *directory; + name = (char*)malloc(strlen(name1)+strlen(name2)+1); + strcpy(name, name1); + strcat(name, name2); + directory = opendir(name); + free(name); + if(directory) + { + closedir(directory); + return true; + } + else + return false; +} + +unsigned int _filesize(FILE* fd) +{ + unsigned int tmp, oldpos; + oldpos = ftell(fd); + fseek(fd, 0, SEEK_END); + tmp = ftell(fd); + fseek(fd, oldpos, SEEK_SET); + return tmp; +} +#define WRITE(x, len) if(fwrite(x, len, 1, outfile) != 1) \ + { \ + closedir(indir_handle); \ + if(filesize > 0) \ + free(buffer); \ + fprintf(stderr, "[ERR] Error writing to file\n"); \ + return; \ + } +static void merge_hxf(const char* indir, FILE* outfile, const char* add) +{ + DIR *indir_handle; + struct dirent *dirs; + char dir[255]; + strcpy(dir, indir); + strcat(dir, add); + + if((indir_handle = opendir(dir)) == NULL) + { + fprintf(stderr, "[ERR] Error opening dir %s\n", indir); + return; + } + + while((dirs = readdir(indir_handle)) != NULL) + { + if(strcmp(dirs->d_name, "..") != 0 && + strcmp(dirs->d_name, ".") != 0) + { + fprintf(stderr, "[INFO] %s\%s\n", add, dirs->d_name); + if(is_dir(dir, dirs->d_name)) + { + char dir2[255]; + strcpy(dir2, add); + strcat(dir2, dirs->d_name); + strcat(dir2, PATH_SEPARATOR); + merge_hxf(indir, outfile, dir2); + } + else + { + FILE *filehandle; + unsigned char *buffer; + char file[255]; + unsigned int filesize; + strcpy(file, dir); + strcat(file, dirs->d_name); + if((filehandle = fopen(file, "rb")) == NULL) + { + fprintf(stderr, "[ERR] Cannot open %s\n", file); + closedir(indir_handle); + return; + } + filesize = _filesize(filehandle); + if(filesize > 0) + { + buffer = (unsigned char*)malloc(filesize); + if(buffer == NULL) + { + fclose(filehandle); + closedir(indir_handle); + fprintf(stderr, "[ERR] Cannot allocate memory\n"); + return; + } + if(fread(buffer, filesize, 1, filehandle) != 1) + { + fclose(filehandle); + closedir(indir_handle); + free(buffer); + fprintf(stderr, "[ERR] Cannot read from %s%s%s\n", add, PATH_SEPARATOR, dirs->d_name); + return; + } + } + fclose(filehandle); + + if(strlen(add)>0) + { +#ifdef _DIRENT_HAVE_D_NAMLEN + WRITE(int2le(dirs->d_namlen+strlen(add)), 4); +#else + WRITE(int2le(strlen(dirs->d_name)+strlen(add)), 4); +#endif +#ifndef _WIN32 + WRITE(replace((char*)add), strlen(add)-1); +#else + WRITE(add, strlen(add)-1); +#endif + WRITE(PATH_SEPARATOR, 1); +#ifdef _DIRENT_HAVE_D_NAMLEN + WRITE(dirs->d_name, dirs->d_namlen); +#else + WRITE(dirs->d_name, strlen(dirs->d_name)); +#endif + } + else + { +#ifdef _DIRENT_HAVE_D_NAMLEN + WRITE(int2le(dirs->d_namlen), 4); + WRITE(dirs->d_name, dirs->d_namlen); +#else + WRITE(int2le(strlen(dirs->d_name)), 4); + WRITE(dirs->d_name, strlen(dirs->d_name)); +#endif + } + WRITE(int2le(filesize), 4); + if(filesize>0) + { + WRITE(buffer, filesize); + free(buffer); + } + } + } + } + closedir(indir_handle); +} + +static void print_usage(void) +{ +#ifdef _WIN32 + fprintf(stderr, "Usage: hxfmerge.exe [INPUT_DIR] [FW]\n\n"); + fprintf(stderr, "Example: hxfmerge.exe VX747_extracted\\ VX747.HXF\n\n"); +#else + fprintf(stderr, "Usage: HXFmerge [INPUT_DIR] [FW]\n\n"); + fprintf(stderr, "Example: HXFmerge VX747_extracted/ VX747.HXF\n\n"); +#endif +} + +static int checksum(FILE *file) +{ + int oldpos = ftell(file); + int ret=0, i, filesize = _filesize(file)-0x40; + unsigned char *buf; + + buf = (unsigned char*)malloc(filesize); + + if(buf == NULL) + { + fseek(file, oldpos, SEEK_SET); + fprintf(stderr, "[ERR] Error while allocating memory\n"); + return 0; + } + + fseek(file, 0x40, SEEK_SET); + if(fread(buf, filesize, 1, file) != 1) + { + free(buf); + fseek(file, oldpos, SEEK_SET); + fprintf(stderr, "[ERR] Error while reading from file\n"); + return 0; + } + + fprintf(stderr, "[INFO] Computing checksum..."); + + for(i = 0; i < filesize; i+=4) + ret += le2int(&buf[i]); + + free(buf); + fseek(file, oldpos, SEEK_SET); + + fprintf(stderr, " Done!\n"); + return ret; +} + +int main(int argc, char *argv[]) +{ + FILE *outfile; + + fprintf(stderr, "HXFmerge v" VERSION " - (C) 2008 Maurus Cuelenaere\n"); + fprintf(stderr, "This is free software; see the source for copying conditions. There is NO\n"); + fprintf(stderr, "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); + + if(argc != 3) + { + print_usage(); + return 1; + } + +#ifdef _WIN32 + if(strcmp((char*)(argv[1]+strlen(argv[1])-1), "\\") != 0) + { + fprintf(stderr, "[ERR] Input path must end with a \\\n"); +#else + if(strcmp((char*)(argv[1]+strlen(argv[1])-1), "/") != 0) + { + fprintf(stderr, "[ERR] Input path must end with a /\n"); +#endif + return 2; + } + + if((outfile = fopen(argv[2], "wb+")) == NULL) + { + fprintf(stderr, "[ERR] Cannot open %s\n", argv[2]); + return 3; + } + + fseek(outfile, 0x40, SEEK_SET); + + merge_hxf(argv[1], outfile, ""); + + fflush(outfile); + + fprintf(stderr, "[INFO] Filling header...\n"); + +#undef WRITE +#define WRITE(x, len) if(fwrite(x, len, 1, outfile) != 1) \ + { \ + fprintf(stderr, "[ERR] Cannot write to %s\n", argv[1]); \ + fclose(outfile); \ + return 4; \ + } + fflush(outfile); + fseek(outfile, 0, SEEK_SET); + WRITE("WADF0100200804111437", 20); + WRITE(int2le(_filesize(outfile)), 4); + WRITE(int2le(checksum(outfile)), 4); + WRITE(int2le(0), 4); + WRITE("Chinachip PMP firmware V1.0\0\0\0\0\0", 32); + fclose(outfile); + + fprintf(stderr, "[INFO] Done!\n"); + + return 0; +} diff --git a/utils/jz4740_tools/HXFreplace.c b/utils/jz4740_tools/HXFreplace.c index 989a59dd61..bcfff82540 100644 --- a/utils/jz4740_tools/HXFreplace.c +++ b/utils/jz4740_tools/HXFreplace.c @@ -1,242 +1,242 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define VERSION "0.1" - -static unsigned char* int2le(unsigned int val) -{ - static unsigned char addr[4]; - addr[0] = val & 0xff; - addr[1] = (val >> 8) & 0xff; - addr[2] = (val >> 16) & 0xff; - addr[3] = (val >> 24) & 0xff; - return addr; -} - -static unsigned int le2int(unsigned char* buf) -{ - unsigned int res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; - - return res; -} - -unsigned int _filesize(FILE* fd) -{ - unsigned int tmp, oldpos; - oldpos = ftell(fd); - fseek(fd, 0, SEEK_END); - tmp = ftell(fd); - fseek(fd, oldpos, SEEK_SET); - return tmp; -} - -static void print_usage(void) -{ -#ifdef _WIN32 - fprintf(stderr, "Usage: hxfreplace.exe [IN_FW] [OUT_FW] [BIN_FILE]\n\n"); - fprintf(stderr, "Example: hxfreplace.exe VX747.HXF out.hxf ccpmp.bin\n\n"); -#else - fprintf(stderr, "Usage: HXFreplace [IN_FW] [OUT_FW] [BIN_FILE]\n\n"); - fprintf(stderr, "Example: HXFreplace VX747.HXF out.hxf ccpmp.bin\n\n"); -#endif -} - -static int checksum(FILE *file) -{ - int oldpos = ftell(file); - int ret=0, i, filesize = _filesize(file)-0x40; - unsigned char *buf; - - buf = (unsigned char*)malloc(filesize); - - if(buf == NULL) - { - fseek(file, oldpos, SEEK_SET); - fprintf(stderr, "[ERR] Error while allocating memory\n"); - return 0; - } - - fseek(file, 0x40, SEEK_SET); - if(fread(buf, filesize, 1, file) != 1) - { - free(buf); - fseek(file, oldpos, SEEK_SET); - fprintf(stderr, "[ERR] Error while reading from file\n"); - return 0; - } - - fprintf(stderr, "[INFO] Computing checksum..."); - - for(i = 0; i < filesize; i+=4) - ret += le2int(&buf[i]); - - free(buf); - fseek(file, oldpos, SEEK_SET); - - fprintf(stderr, " Done!\n"); - return ret; -} - -int main(int argc, char *argv[]) -{ - FILE *infile, *outfile, *fw; - - fprintf(stderr, "HXFreplace v" VERSION " - (C) 2008 Maurus Cuelenaere\n"); - fprintf(stderr, "This is free software; see the source for copying conditions. There is NO\n"); - fprintf(stderr, "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); - - if(argc != 4) - { - print_usage(); - return 1; - } - - if((infile = fopen(argv[1], "rb")) == NULL) - { - fprintf(stderr, "[ERR] Cannot open %s\n", argv[1]); - return 2; - } - - if(fseek(infile, 0x40, SEEK_SET) != 0) - { - fprintf(stderr, "[ERR] Cannot seek to 0x40\n"); - fclose(infile); - return 3; - } - - fprintf(stderr, "[INFO] Searching for ccpmp.bin...\n"); - - int found = -1; - int filenamesize; - char *filename; - unsigned char tmp[4]; - -#define READ(x, len) if(fread(x, len, 1, infile) != 1) \ - { \ - fprintf(stderr, "[ERR] Cannot read from %s\n", argv[1]); \ - fclose(infile); \ - return 4; \ - } - while(found < 0) - { - READ(&tmp[0], 4); - filenamesize = le2int(tmp); - filename = (char*)malloc(filenamesize); - READ(filename, filenamesize); - if(strcmp(filename, "ccpmp.bin") == 0) - found = ftell(infile); - else - { - READ(&tmp[0], 4); - fseek(infile, le2int(tmp), SEEK_CUR); - } - free(filename); - } - - fprintf(stderr, "[INFO] Found ccpmp.bin at 0x%x\n", found); - - if((outfile = fopen(argv[2], "wb+")) == NULL) - { - fclose(infile); - fprintf(stderr, "[ERR] Cannot open %s\n", argv[2]); - return 5; - } - -#define WRITE(x, len) if(fwrite(x, len, 1, outfile) != 1) \ - { \ - fprintf(stderr, "[ERR] Cannot write to %s\n", argv[2]); \ - fclose(outfile); \ - if(fw != NULL) \ - fclose(fw); \ - return 5; \ - } - - unsigned char* buffer; - - buffer = (unsigned char*)malloc(found); - fseek(infile, 0, SEEK_SET); - READ(buffer, found); - WRITE(buffer, found); - free(buffer); - - if((fw = fopen(argv[3], "rb")) == NULL) - { - fclose(infile); - fclose(outfile); - fprintf(stderr, "[ERR] Cannot open %s\n", argv[3]); - } - - int fw_filesize = _filesize(fw); - -#define READ2(x, len) if(fread(x, len, 1, fw) != 1) \ - { \ - fprintf(stderr, "[ERR] Cannot read from %s\n", argv[3]); \ - fclose(infile); \ - fclose(outfile); \ - return 6; \ - } - buffer = (unsigned char*)malloc(fw_filesize); - READ2(buffer, fw_filesize); - fputc(0x20, outfile); /* Padding */ - WRITE(int2le(fw_filesize), 4); - WRITE(buffer, fw_filesize); - free(buffer); - fclose(fw); - fw = NULL; - - fseek(infile, found+1, SEEK_SET); - READ(&tmp, 4); - if(fseek(infile, le2int(&tmp[0]), SEEK_CUR) != 0) - { - fprintf(stderr, "[INFO] Cannot seek into %s\n", argv[1]); - fclose(infile); - fclose(outfile); - return 7; - } - found = ftell(infile); - - int other_size = _filesize(infile) - found; - buffer = (unsigned char*)malloc(other_size); - READ(buffer, other_size); - WRITE(buffer, other_size); - free(buffer); - fclose(infile); - - fflush(outfile); - fseek(outfile, 0x14, SEEK_SET); - WRITE(int2le(_filesize(outfile)), 4); - WRITE(int2le(checksum(outfile)), 4); - fclose(outfile); - - fprintf(stderr, "[INFO] Done!\n"); - - return 0; -} +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 by Maurus Cuelenaere + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define VERSION "0.1" + +static unsigned char* int2le(unsigned int val) +{ + static unsigned char addr[4]; + addr[0] = val & 0xff; + addr[1] = (val >> 8) & 0xff; + addr[2] = (val >> 16) & 0xff; + addr[3] = (val >> 24) & 0xff; + return addr; +} + +static unsigned int le2int(unsigned char* buf) +{ + unsigned int res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; + + return res; +} + +unsigned int _filesize(FILE* fd) +{ + unsigned int tmp, oldpos; + oldpos = ftell(fd); + fseek(fd, 0, SEEK_END); + tmp = ftell(fd); + fseek(fd, oldpos, SEEK_SET); + return tmp; +} + +static void print_usage(void) +{ +#ifdef _WIN32 + fprintf(stderr, "Usage: hxfreplace.exe [IN_FW] [OUT_FW] [BIN_FILE]\n\n"); + fprintf(stderr, "Example: hxfreplace.exe VX747.HXF out.hxf ccpmp.bin\n\n"); +#else + fprintf(stderr, "Usage: HXFreplace [IN_FW] [OUT_FW] [BIN_FILE]\n\n"); + fprintf(stderr, "Example: HXFreplace VX747.HXF out.hxf ccpmp.bin\n\n"); +#endif +} + +static int checksum(FILE *file) +{ + int oldpos = ftell(file); + int ret=0, i, filesize = _filesize(file)-0x40; + unsigned char *buf; + + buf = (unsigned char*)malloc(filesize); + + if(buf == NULL) + { + fseek(file, oldpos, SEEK_SET); + fprintf(stderr, "[ERR] Error while allocating memory\n"); + return 0; + } + + fseek(file, 0x40, SEEK_SET); + if(fread(buf, filesize, 1, file) != 1) + { + free(buf); + fseek(file, oldpos, SEEK_SET); + fprintf(stderr, "[ERR] Error while reading from file\n"); + return 0; + } + + fprintf(stderr, "[INFO] Computing checksum..."); + + for(i = 0; i < filesize; i+=4) + ret += le2int(&buf[i]); + + free(buf); + fseek(file, oldpos, SEEK_SET); + + fprintf(stderr, " Done!\n"); + return ret; +} + +int main(int argc, char *argv[]) +{ + FILE *infile, *outfile, *fw; + + fprintf(stderr, "HXFreplace v" VERSION " - (C) 2008 Maurus Cuelenaere\n"); + fprintf(stderr, "This is free software; see the source for copying conditions. There is NO\n"); + fprintf(stderr, "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); + + if(argc != 4) + { + print_usage(); + return 1; + } + + if((infile = fopen(argv[1], "rb")) == NULL) + { + fprintf(stderr, "[ERR] Cannot open %s\n", argv[1]); + return 2; + } + + if(fseek(infile, 0x40, SEEK_SET) != 0) + { + fprintf(stderr, "[ERR] Cannot seek to 0x40\n"); + fclose(infile); + return 3; + } + + fprintf(stderr, "[INFO] Searching for ccpmp.bin...\n"); + + int found = -1; + int filenamesize; + char *filename; + unsigned char tmp[4]; + +#define READ(x, len) if(fread(x, len, 1, infile) != 1) \ + { \ + fprintf(stderr, "[ERR] Cannot read from %s\n", argv[1]); \ + fclose(infile); \ + return 4; \ + } + while(found < 0) + { + READ(&tmp[0], 4); + filenamesize = le2int(tmp); + filename = (char*)malloc(filenamesize); + READ(filename, filenamesize); + if(strcmp(filename, "ccpmp.bin") == 0) + found = ftell(infile); + else + { + READ(&tmp[0], 4); + fseek(infile, le2int(tmp), SEEK_CUR); + } + free(filename); + } + + fprintf(stderr, "[INFO] Found ccpmp.bin at 0x%x\n", found); + + if((outfile = fopen(argv[2], "wb+")) == NULL) + { + fclose(infile); + fprintf(stderr, "[ERR] Cannot open %s\n", argv[2]); + return 5; + } + +#define WRITE(x, len) if(fwrite(x, len, 1, outfile) != 1) \ + { \ + fprintf(stderr, "[ERR] Cannot write to %s\n", argv[2]); \ + fclose(outfile); \ + if(fw != NULL) \ + fclose(fw); \ + return 5; \ + } + + unsigned char* buffer; + + buffer = (unsigned char*)malloc(found); + fseek(infile, 0, SEEK_SET); + READ(buffer, found); + WRITE(buffer, found); + free(buffer); + + if((fw = fopen(argv[3], "rb")) == NULL) + { + fclose(infile); + fclose(outfile); + fprintf(stderr, "[ERR] Cannot open %s\n", argv[3]); + } + + int fw_filesize = _filesize(fw); + +#define READ2(x, len) if(fread(x, len, 1, fw) != 1) \ + { \ + fprintf(stderr, "[ERR] Cannot read from %s\n", argv[3]); \ + fclose(infile); \ + fclose(outfile); \ + return 6; \ + } + buffer = (unsigned char*)malloc(fw_filesize); + READ2(buffer, fw_filesize); + fputc(0x20, outfile); /* Padding */ + WRITE(int2le(fw_filesize), 4); + WRITE(buffer, fw_filesize); + free(buffer); + fclose(fw); + fw = NULL; + + fseek(infile, found+1, SEEK_SET); + READ(&tmp, 4); + if(fseek(infile, le2int(&tmp[0]), SEEK_CUR) != 0) + { + fprintf(stderr, "[INFO] Cannot seek into %s\n", argv[1]); + fclose(infile); + fclose(outfile); + return 7; + } + found = ftell(infile); + + int other_size = _filesize(infile) - found; + buffer = (unsigned char*)malloc(other_size); + READ(buffer, other_size); + WRITE(buffer, other_size); + free(buffer); + fclose(infile); + + fflush(outfile); + fseek(outfile, 0x14, SEEK_SET); + WRITE(int2le(_filesize(outfile)), 4); + WRITE(int2le(checksum(outfile)), 4); + fclose(outfile); + + fprintf(stderr, "[INFO] Done!\n"); + + return 0; +} diff --git a/utils/jz4740_tools/HXFsplit.c b/utils/jz4740_tools/HXFsplit.c index 6e945b067a..dbeace8a20 100644 --- a/utils/jz4740_tools/HXFsplit.c +++ b/utils/jz4740_tools/HXFsplit.c @@ -1,321 +1,321 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#define VERSION "0.2" - -struct header{ - char main_header[20]; - unsigned int size; - unsigned int checksum; - unsigned int unknown; - char other_header[32]; -}; - -static char* basepath(char* path) -{ - static char tmp[255]; - char *ptr, *ptr2, *ptr3; - ptr = path; - ptr2 = (char*)tmp; -#ifdef _WIN32 - ptr3 = strrchr(path, 0x5C); -#else - ptr3 = strrchr(path, 0x2F); -#endif - while((int)ptr < (int)ptr3) - { - *ptr2 = *ptr; - ptr++; - ptr2++; - } -#ifdef _WIN32 - *ptr2 = 0x5C; -#else - *ptr2 = 0x2F; -#endif - ptr2++; - *ptr2 = 0; - return (char*)tmp; -} - -#ifndef _WIN32 -static void replace(char* str) -{ - char *ptr = str; - while(*ptr != 0) - { - if(*ptr == 0x5C) /* \ */ - *ptr = 0x2F; /* / */ - ptr++; - } -} -#endif - -static unsigned int le2int(unsigned char* buf) -{ - unsigned int res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; - - return res; -} - -#ifdef _WIN32 - #define PATH_SEPARATOR '\\' -#else - #define PATH_SEPARATOR '/' -#endif - -static unsigned int __mkdir(const char *path) -{ - char opath[256]; - char *p; - size_t len; - - strncpy(opath, path, sizeof(opath)); - len = strlen(opath); - if(opath[len - 1] == PATH_SEPARATOR) - opath[len - 1] = '\0'; - for(p = opath; *p; p++) - if(*p == PATH_SEPARATOR) - { - *p = '\0'; - if(access(opath, F_OK)) -#ifdef _WIN32 - mkdir(opath); -#else - mkdir(opath, S_IRWXU); -#endif - *p = PATH_SEPARATOR; - } - if(access(opath, F_OK)) -#ifdef _WIN32 - return mkdir(opath); -#else - return mkdir(opath, S_IRWXU); -#endif - else - return -1; -} - -#if 0 -static bool dir_exists(const char *dir) -{ - struct stat buf; - memset(&buf, 0, sizeof(struct stat)); - printf("start: %s\n", dir); - char *dir_cpy = (char*)malloc(strlen(dir)); - strcpy(dir_cpy, dir); - printf("%s\n", dir_cpy); - int tmp = (int)dir_cpy; - while(*dir_cpy != 0) - { - dir_cpy++; - if(*dir_cpy == PATH_SEPARATOR && *(dir_cpy+1) == 0) - *dir_cpy = 0; - } - printf("while_done\n"); - dir_cpy = (char*)tmp; - printf("statting %s...\n", dir_cpy); - tmp = stat(dir_cpy, &buf); - printf("chk_dir(%s) = %d\n", dir_cpy, tmp); - free(dir_cpy); - return tmp == 0; -} -#endif - -static bool file_exists(const char *file) -{ - struct stat buf; - return stat(file, &buf) == 0; -} - - -static int split_hxf(const unsigned char* infile, unsigned int size, const char* outpath) -{ - FILE *outfile; - char *filename; - unsigned int filenamesize, filesize; - while(size > 0) - { - filenamesize = le2int((unsigned char*)infile); - infile += 4; - size -= 4; - if(size > 0) - { - filename = (char*)calloc(1, filenamesize+1+strlen(outpath)); - memcpy(filename, outpath, strlen(outpath)); - memcpy(&filename[strlen(outpath)], infile, filenamesize); -#ifndef _WIN32 - replace(filename); -#endif - infile += filenamesize + 1; /* + padding */ - size -= filenamesize + 1; - - filesize = le2int((unsigned char*)infile); - infile += 4; - size -= 4; -#if 0 - if(!dir_exists(basepath(filename))) -#endif - { - printf("[INFO] %s\n", basepath(filename)); - if(__mkdir(basepath(filename)) != 0) - { -#if 0 - fprintf(stderr, "[ERR] Error creating directory %s\n", basepath(filename)); - return -3; -#endif - } - } - - if(!file_exists(filename)) - { - printf("[INFO] %s: %d bytes\n", filename, filesize); - if((outfile = fopen(filename, "wb")) == NULL) - { - fprintf(stderr, "[ERR] Error opening file %s\n", filename); - return -1; - } - if(filesize>0) - { - if(fwrite(infile, filesize, 1, outfile) != 1) - { - fclose(outfile); - fprintf(stderr, "[ERR] Error writing to file %s\n", filename); - return -2; - } - } - fclose(outfile); - } - - infile += filesize; - size -= filesize; - } - } - return 0; -} - -static void print_usage(void) -{ -#ifdef _WIN32 - fprintf(stderr, "Usage: hxfsplit.exe [FW] [OUTPUT_DIR]\n\n"); - fprintf(stderr, "Example: hxfsplit.exe VX747.HXF VX747_extracted\\\n\n"); -#else - fprintf(stderr, "Usage: HXFsplit [FW] [OUTPUT_DIR]\n\n"); - fprintf(stderr, "Example: HXFsplit VX747.HXF VX747_extracted/\n\n"); -#endif -} - -int main(int argc, char *argv[]) -{ - FILE *infile; - struct header hdr; - unsigned char *inbuffer; - - fprintf(stderr, "HXFsplit v" VERSION " - (C) 2008 Maurus Cuelenaere\n"); - fprintf(stderr, "This is free software; see the source for copying conditions. There is NO\n"); - fprintf(stderr, "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); - - if(argc != 3) - { - print_usage(); - return 1; - } - -#ifdef _WIN32 - if(strcmp((char*)(argv[2]+strlen(argv[2])-1), "\\") != 0) - { - fprintf(stderr, "[ERR] Output path must end with a \\\n"); -#else - if(strcmp((char*)(argv[2]+strlen(argv[2])-1), "/") != 0) - { - fprintf(stderr, "[ERR] Output path must end with a /\n"); -#endif - return 2; - } - - if((infile = fopen(argv[1], "rb")) == NULL) - { - fprintf(stderr, "[ERR] Cannot open %s\n", argv[1]); - return 3; - } - - if((inbuffer = (unsigned char*)malloc(sizeof(struct header))) == NULL) - { - fclose(infile); - fprintf(stderr, "[ERR] Error allocating %d bytes buffer\n", sizeof(struct header)); - return 4; - } - - if(fread(inbuffer, sizeof(struct header), 1, infile) != 1) - { - fclose(infile); - fprintf(stderr, "Cannot read header of %s\n", argv[1]); - return 5; - } - - memcpy(hdr.main_header, inbuffer, 20); - hdr.size = le2int(&inbuffer[20]); - hdr.checksum = le2int(&inbuffer[24]); - hdr.unknown = le2int(&inbuffer[28]); - memcpy(hdr.other_header, &inbuffer[32], 32); - free(inbuffer); - - if(strcmp(hdr.other_header, "Chinachip PMP firmware V1.0") != 0) - { - fclose(infile); - fprintf(stderr, "[ERR] Header doesn't match\n"); - return 6; - } - - if((inbuffer = (unsigned char*)malloc(hdr.size)) == NULL) - { - fclose(infile); - fprintf(stderr, "[ERR] Error allocating %d bytes buffer\n", hdr.size); - return 7; - } - - fseek(infile, sizeof(struct header), SEEK_SET); - - if(fread(inbuffer, hdr.size-sizeof(struct header), 1, infile) != 1) - { - fclose(infile); - free(inbuffer); - fprintf(stderr, "[ERR] Cannot read file in buffer\n"); - return 8; - } - - fclose(infile); - - split_hxf(inbuffer, hdr.size-sizeof(struct header), argv[2]); - - free(inbuffer); - - return 0; -} +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 by Maurus Cuelenaere + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define VERSION "0.2" + +struct header{ + char main_header[20]; + unsigned int size; + unsigned int checksum; + unsigned int unknown; + char other_header[32]; +}; + +static char* basepath(char* path) +{ + static char tmp[255]; + char *ptr, *ptr2, *ptr3; + ptr = path; + ptr2 = (char*)tmp; +#ifdef _WIN32 + ptr3 = strrchr(path, 0x5C); +#else + ptr3 = strrchr(path, 0x2F); +#endif + while((int)ptr < (int)ptr3) + { + *ptr2 = *ptr; + ptr++; + ptr2++; + } +#ifdef _WIN32 + *ptr2 = 0x5C; +#else + *ptr2 = 0x2F; +#endif + ptr2++; + *ptr2 = 0; + return (char*)tmp; +} + +#ifndef _WIN32 +static void replace(char* str) +{ + char *ptr = str; + while(*ptr != 0) + { + if(*ptr == 0x5C) /* \ */ + *ptr = 0x2F; /* / */ + ptr++; + } +} +#endif + +static unsigned int le2int(unsigned char* buf) +{ + unsigned int res = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; + + return res; +} + +#ifdef _WIN32 + #define PATH_SEPARATOR '\\' +#else + #define PATH_SEPARATOR '/' +#endif + +static unsigned int __mkdir(const char *path) +{ + char opath[256]; + char *p; + size_t len; + + strncpy(opath, path, sizeof(opath)); + len = strlen(opath); + if(opath[len - 1] == PATH_SEPARATOR) + opath[len - 1] = '\0'; + for(p = opath; *p; p++) + if(*p == PATH_SEPARATOR) + { + *p = '\0'; + if(access(opath, F_OK)) +#ifdef _WIN32 + mkdir(opath); +#else + mkdir(opath, S_IRWXU); +#endif + *p = PATH_SEPARATOR; + } + if(access(opath, F_OK)) +#ifdef _WIN32 + return mkdir(opath); +#else + return mkdir(opath, S_IRWXU); +#endif + else + return -1; +} + +#if 0 +static bool dir_exists(const char *dir) +{ + struct stat buf; + memset(&buf, 0, sizeof(struct stat)); + printf("start: %s\n", dir); + char *dir_cpy = (char*)malloc(strlen(dir)); + strcpy(dir_cpy, dir); + printf("%s\n", dir_cpy); + int tmp = (int)dir_cpy; + while(*dir_cpy != 0) + { + dir_cpy++; + if(*dir_cpy == PATH_SEPARATOR && *(dir_cpy+1) == 0) + *dir_cpy = 0; + } + printf("while_done\n"); + dir_cpy = (char*)tmp; + printf("statting %s...\n", dir_cpy); + tmp = stat(dir_cpy, &buf); + printf("chk_dir(%s) = %d\n", dir_cpy, tmp); + free(dir_cpy); + return tmp == 0; +} +#endif + +static bool file_exists(const char *file) +{ + struct stat buf; + return stat(file, &buf) == 0; +} + + +static int split_hxf(const unsigned char* infile, unsigned int size, const char* outpath) +{ + FILE *outfile; + char *filename; + unsigned int filenamesize, filesize; + while(size > 0) + { + filenamesize = le2int((unsigned char*)infile); + infile += 4; + size -= 4; + if(size > 0) + { + filename = (char*)calloc(1, filenamesize+1+strlen(outpath)); + memcpy(filename, outpath, strlen(outpath)); + memcpy(&filename[strlen(outpath)], infile, filenamesize); +#ifndef _WIN32 + replace(filename); +#endif + infile += filenamesize + 1; /* + padding */ + size -= filenamesize + 1; + + filesize = le2int((unsigned char*)infile); + infile += 4; + size -= 4; +#if 0 + if(!dir_exists(basepath(filename))) +#endif + { + printf("[INFO] %s\n", basepath(filename)); + if(__mkdir(basepath(filename)) != 0) + { +#if 0 + fprintf(stderr, "[ERR] Error creating directory %s\n", basepath(filename)); + return -3; +#endif + } + } + + if(!file_exists(filename)) + { + printf("[INFO] %s: %d bytes\n", filename, filesize); + if((outfile = fopen(filename, "wb")) == NULL) + { + fprintf(stderr, "[ERR] Error opening file %s\n", filename); + return -1; + } + if(filesize>0) + { + if(fwrite(infile, filesize, 1, outfile) != 1) + { + fclose(outfile); + fprintf(stderr, "[ERR] Error writing to file %s\n", filename); + return -2; + } + } + fclose(outfile); + } + + infile += filesize; + size -= filesize; + } + } + return 0; +} + +static void print_usage(void) +{ +#ifdef _WIN32 + fprintf(stderr, "Usage: hxfsplit.exe [FW] [OUTPUT_DIR]\n\n"); + fprintf(stderr, "Example: hxfsplit.exe VX747.HXF VX747_extracted\\\n\n"); +#else + fprintf(stderr, "Usage: HXFsplit [FW] [OUTPUT_DIR]\n\n"); + fprintf(stderr, "Example: HXFsplit VX747.HXF VX747_extracted/\n\n"); +#endif +} + +int main(int argc, char *argv[]) +{ + FILE *infile; + struct header hdr; + unsigned char *inbuffer; + + fprintf(stderr, "HXFsplit v" VERSION " - (C) 2008 Maurus Cuelenaere\n"); + fprintf(stderr, "This is free software; see the source for copying conditions. There is NO\n"); + fprintf(stderr, "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); + + if(argc != 3) + { + print_usage(); + return 1; + } + +#ifdef _WIN32 + if(strcmp((char*)(argv[2]+strlen(argv[2])-1), "\\") != 0) + { + fprintf(stderr, "[ERR] Output path must end with a \\\n"); +#else + if(strcmp((char*)(argv[2]+strlen(argv[2])-1), "/") != 0) + { + fprintf(stderr, "[ERR] Output path must end with a /\n"); +#endif + return 2; + } + + if((infile = fopen(argv[1], "rb")) == NULL) + { + fprintf(stderr, "[ERR] Cannot open %s\n", argv[1]); + return 3; + } + + if((inbuffer = (unsigned char*)malloc(sizeof(struct header))) == NULL) + { + fclose(infile); + fprintf(stderr, "[ERR] Error allocating %d bytes buffer\n", sizeof(struct header)); + return 4; + } + + if(fread(inbuffer, sizeof(struct header), 1, infile) != 1) + { + fclose(infile); + fprintf(stderr, "Cannot read header of %s\n", argv[1]); + return 5; + } + + memcpy(hdr.main_header, inbuffer, 20); + hdr.size = le2int(&inbuffer[20]); + hdr.checksum = le2int(&inbuffer[24]); + hdr.unknown = le2int(&inbuffer[28]); + memcpy(hdr.other_header, &inbuffer[32], 32); + free(inbuffer); + + if(strcmp(hdr.other_header, "Chinachip PMP firmware V1.0") != 0) + { + fclose(infile); + fprintf(stderr, "[ERR] Header doesn't match\n"); + return 6; + } + + if((inbuffer = (unsigned char*)malloc(hdr.size)) == NULL) + { + fclose(infile); + fprintf(stderr, "[ERR] Error allocating %d bytes buffer\n", hdr.size); + return 7; + } + + fseek(infile, sizeof(struct header), SEEK_SET); + + if(fread(inbuffer, hdr.size-sizeof(struct header), 1, infile) != 1) + { + fclose(infile); + free(inbuffer); + fprintf(stderr, "[ERR] Cannot read file in buffer\n"); + return 8; + } + + fclose(infile); + + split_hxf(inbuffer, hdr.size-sizeof(struct header), argv[2]); + + free(inbuffer); + + return 0; +} -- cgit v1.2.3