jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

arm/pe: nrv2b support for v4a mode

Browse Source
This commit is contained in:
László Molnár 2006-07-23 21:50:51 +02:00
parent 0d774527b4
commit f01c94e8bc
3 changed files with 1687 additions and 1514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/p_armpe.cpp
View File

@ -185,28 +185,17 @@ const int *PackArmPe::getCompressionMethods(int method, int level) const
{
static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2E_8, M_LZMA, M_END };
static const int m_nrv2e[] = { M_NRV2E_8, M_NRV2B_8, M_LZMA, M_END };
static const int m_nrv2d_v4[] = { M_NRV2D_8, M_NRV2E_8, M_LZMA, M_END };
static const int m_nrv2e_v4[] = { M_NRV2E_8, M_NRV2D_8, M_LZMA, M_END };
static const int m_lzma[] = { M_LZMA, M_END };
UNUSED(level);
if (M_IS_LZMA(method))
return m_lzma;
// FIXME this when we have v4 mode nrv2b
if (!use_thumb_stub)
{
if (M_IS_NRV2E(method))
return m_nrv2e_v4 ;
if (M_IS_NRV2D(method))
return m_nrv2d_v4;
return m_nrv2e_v4;
}
return getDefaultCompressionMethods_8(method, level);
if (M_IS_NRV2B(method))
return m_nrv2b;
if (M_IS_NRV2E(method))
return m_nrv2e;
if (M_IS_LZMA(method))
return m_lzma;
return m_nrv2e;
}
@ -1684,24 +1673,14 @@ int PackArmPe::buildLoader(const Filter *ft)
addLoader("+40C,Imports", NULL);
addLoader("ProcessEnd", NULL);
if (!use_thumb_stub)
{
if (ph.method == M_NRV2E_8)
addLoader(".ucl_nrv2e_decompress_8", NULL);
else if (ph.method == M_NRV2D_8)
addLoader(".ucl_nrv2d_decompress_8", NULL);
else if (M_IS_LZMA(ph.method))
addLoader("+40C,LZMA_DECODE,LZMA_DEC10", NULL);
}
else
{
if (ph.method == M_NRV2E_8)
addLoader(".ucl_nrv2e_decompress_8", NULL);
else if (ph.method == M_NRV2B_8)
addLoader(".ucl_nrv2b_decompress_8", NULL);
else if (M_IS_LZMA(ph.method))
addLoader("+40C,LZMA_DECODE,LZMA_DEC10", NULL);
}
if (ph.method == M_NRV2E_8)
addLoader(".ucl_nrv2e_decompress_8", NULL);
else if (ph.method == M_NRV2B_8)
addLoader(".ucl_nrv2b_decompress_8", NULL);
else if (ph.method == M_NRV2D_8)
addLoader(".ucl_nrv2d_decompress_8", NULL);
else if (M_IS_LZMA(ph.method))
addLoader("+40C,LZMA_DECODE,LZMA_DEC10", NULL);
addLoader("IDENTSTR,UPX1HEAD", NULL);
freezeLoader();

3150
src/stub/arm.v4a-wince.pe.h
View File

File diff suppressed because it is too large Load Diff

8
src/stub/src/arm.v4a-wince.pe.S
View File

@ -350,6 +350,14 @@ section Call2D
bl ucl_nrv2d_decompress_8
DDUMP (#'C')
section .ucl_nrv2b_decompress_8
#include "arch/arm/v4a/nrv2b_d8.S"
section Call2B
bl ucl_nrv2b_decompress_8
DDUMP (#'C')
////////////////////////////////////////
section CallLZMA