diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2018-05-25 16:33:48 -0300 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-04 03:04:40 +0000 |
commit | d0427759c67704fe0f1b04edadd4d30329af268c (patch) | |
tree | be555a72712a68658dd907fc600f03385df8e2cf /src/corelib/io/qresource.cpp | |
parent | c053f9d15467459477ccbbe156a096e3ac5e3a91 (diff) |
Add qbswap for a memory region
The compiler was generating some vectorized code for qresource.cpp but
it wasn't very efficient. So improve upon it and make use in other
places where we read UTF-16BE strings.
[ChangeLog][QtCore] Added an overload of q{To,From}{Big,Little}Endian
that operates on a memory region.
Change-Id: I6a540578e810472bb455fffd1531fa2f1d724dfc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/corelib/io/qresource.cpp')
-rw-r--r-- | src/corelib/io/qresource.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 7502fb57a3..367cd78d65 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -52,7 +52,9 @@ #include "qendian.h" #include <qshareddata.h> #include <qplatformdefs.h> +#include <qendian.h> #include "private/qabstractfileengine_p.h" +#include "private/qsimd_p.h" #include "private/qsystemerror_p.h" #ifdef Q_OS_UNIX @@ -629,17 +631,13 @@ inline QString QResourceRoot::name(int node) const QString ret; qint32 name_offset = qFromBigEndian<qint32>(tree + offset); - const qint16 name_length = qFromBigEndian<qint16>(names + name_offset); + quint16 name_length = qFromBigEndian<qint16>(names + name_offset); name_offset += 2; name_offset += 4; //jump past hash ret.resize(name_length); QChar *strData = ret.data(); - for(int i = 0; i < name_length*2; i+=2) { - QChar c(names[name_offset+i+1], names[name_offset+i]); - *strData = c; - ++strData; - } + qFromBigEndian<ushort>(names + name_offset, name_length, strData); return ret; } |