AxioDL
/
nod
mirror of https://github.com/AxioDL/nod.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed unneeded branch predictions

This commit is contained in:
Jack Andersen 2015-07-04 12:18:01 -10:00
parent 46bef74daa
commit 1dfdf929ee
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/DiscIOWBFS.cpp
View File

@ -6,13 +6,6 @@
namespace NOD namespace NOD
{ {
#ifndef WIN32
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)
#else
#define likely(x) (x)
#define unlikely(x) (x)
#endif
#define ALIGN_LBA(x) (((x)+p->hd_sec_sz-1)&(~(p->hd_sec_sz-1))) #define ALIGN_LBA(x) (((x)+p->hd_sec_sz-1)&(~(p->hd_sec_sz-1)))
static uint8_t size_to_shift(uint32_t size) static uint8_t size_to_shift(uint32_t size)
@ -197,34 +190,34 @@ public:
uint64_t len_copied; uint64_t len_copied;
int err = 0; int err = 0;
uint8_t *ptr = data; uint8_t *ptr = data;
if (unlikely(iwlba==0)) if (!iwlba)
return 1; return 1;
if (unlikely(off)) if (off)
{ {
off*=4; off*=4;
err = wbfsReadSector(p->part_lba + (iwlba<<iwlba_shift) + lba, 1, m_tmpBuffer.get()); err = wbfsReadSector(p->part_lba + (iwlba<<iwlba_shift) + lba, 1, m_tmpBuffer.get());
if (err) if (err)
return err; return err;
len_copied = p->hd_sec_sz - off; len_copied = p->hd_sec_sz - off;
if (likely(len < len_copied)) if (len < len_copied)
len_copied = len; len_copied = len;
memcpy(ptr, m_tmpBuffer.get() + off, len_copied); memcpy(ptr, m_tmpBuffer.get() + off, len_copied);
len -= len_copied; len -= len_copied;
ptr += len_copied; ptr += len_copied;
lba++; lba++;
if (unlikely(lba>lba_mask && len)) if (lba>lba_mask && len)
{ {
lba=0; lba=0;
iwlba = SBig(d->wlba_table[++wlba]); iwlba = SBig(d->wlba_table[++wlba]);
if (unlikely(iwlba==0)) if (!iwlba)
return 1; return 1;
} }
} }
while (likely(len>=p->hd_sec_sz)) while (len>=p->hd_sec_sz)
{ {
uint32_t nlb = len>>(p->hd_sec_sz_s); uint32_t nlb = len>>(p->hd_sec_sz_s);
if (unlikely(lba + nlb > p->wbfs_sec_sz)) // dont cross wbfs sectors.. if (lba + nlb > p->wbfs_sec_sz) // dont cross wbfs sectors..
nlb = p->wbfs_sec_sz-lba; nlb = p->wbfs_sec_sz-lba;
err = wbfsReadSector(p->part_lba + (iwlba<<iwlba_shift) + lba, nlb, ptr); err = wbfsReadSector(p->part_lba + (iwlba<<iwlba_shift) + lba, nlb, ptr);
if (err) if (err)
@ -232,15 +225,15 @@ public:
len -= nlb<<p->hd_sec_sz_s; len -= nlb<<p->hd_sec_sz_s;
ptr += nlb<<p->hd_sec_sz_s; ptr += nlb<<p->hd_sec_sz_s;
lba += nlb; lba += nlb;
if (unlikely(lba>lba_mask && len)) if (lba>lba_mask && len)
{ {
lba = 0; lba = 0;
iwlba = SBig(d->wlba_table[++wlba]); iwlba = SBig(d->wlba_table[++wlba]);
if (unlikely(iwlba==0)) if (!iwlba)
return 1; return 1;
} }
} }
if (unlikely(len)) if (len)
{ {
err = wbfsReadSector(p->part_lba + (iwlba<<iwlba_shift) + lba, 1, m_tmpBuffer.get()); err = wbfsReadSector(p->part_lba + (iwlba<<iwlba_shift) + lba, 1, m_tmpBuffer.get());
if (err) if (err)