NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Buffer转整数时，支持指定起始位置和大小端

This commit is contained in:
大石头 2017-07-08 10:14:42 +08:00
parent 11cfe84b32
commit fb91451698
2 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Core/Buffer.cpp
View File

@ -281,40 +281,61 @@ String Buffer::ToHex(char sep, int newLine) const
return str; return str;
} }
ushort Buffer::ToUInt16() const ushort Buffer::ToUInt16(int offset, bool isLittleEndian) const
{ {
auto p = GetBuffer(); auto p = GetBuffer() + offset;
if (isLittleEndian)
{
// 字节对齐时才能之前转为目标整数 // 字节对齐时才能之前转为目标整数
if (((int)p & 0x01) == 0) return *(ushort*)p; if (((int)p & 0x01) == 0) return *(ushort*)p;
return p[0] | (p[1] << 8); return p[0] | (p[1] << 8);
}
else
{
return p[1] | (p[0] << 8);
}
} }
//根据数据格式不同选择不同的转换方式，默认高位在后 //根据数据格式不同选择不同的转换方式，默认高位在后
uint Buffer::ToUInt32(bool ishigh) const uint Buffer::ToUInt32(int offset, bool isLittleEndian) const
{ {
auto p = GetBuffer(); auto p = GetBuffer() + offset;
if (ishigh) if (isLittleEndian)
{ {
return (p[2] << 8) | (p[1] << 0x10) | (p[0] << 0x18);
}
// 字节对齐时才能之前转为目标整数 // 字节对齐时才能之前转为目标整数
if (((int)p & 0x03) == 0) return *(uint*)p; if (((int)p & 0x03) == 0) return *(uint*)p;
return p[0] | (p[1] << 8) | (p[2] << 0x10) | (p[3] << 0x18); return p[0] | (p[1] << 8) | (p[2] << 0x10) | (p[3] << 0x18);
}
else
{
return p[3] | (p[2] << 8) | (p[1] << 0x10) | (p[0] << 0x18);
}
} }
UInt64 Buffer::ToUInt64() const UInt64 Buffer::ToUInt64(int offset, bool isLittleEndian) const
{ {
auto p = GetBuffer(); if (isLittleEndian)
{
auto p = GetBuffer() + offset;
// 字节对齐时才能之前转为目标整数 // 字节对齐时才能之前转为目标整数
if (((int)p & 0x07) == 0) return *(UInt64*)p; if (((int)p & 0x07) == 0) return *(UInt64*)p;
uint n1 = p[0] | (p[1] << 8) | (p[2] << 0x10) | (p[3] << 0x18); uint n1 = ToUInt32(offset, isLittleEndian);
p += 4; offset += 4;
uint n2 = p[0] | (p[1] << 8) | (p[2] << 0x10) | (p[3] << 0x18); uint n2 = ToUInt32(offset, isLittleEndian);
return n1 | ((UInt64)n2 << 0x20); return n1 | ((UInt64)n2 << 0x20);
}
else
{
uint n1 = ToUInt32(offset, isLittleEndian);
offset += 4;
uint n2 = ToUInt32(offset, isLittleEndian);
return n2 | ((UInt64)n1 << 0x20);
}
} }
void Buffer::Write(ushort value, int index) void Buffer::Write(ushort value, int index)

6
Core/Buffer.h
View File

@ -82,9 +82,9 @@ public:
// 显示十六进制数据，指定分隔字符和换行长度 // 显示十六进制数据，指定分隔字符和换行长度
String ToHex(char sep = 0, int newLine = 0) const; String ToHex(char sep = 0, int newLine = 0) const;
ushort ToUInt16() const; ushort ToUInt16(int offset = 0, bool isLittleEndian = true) const;
uint ToUInt32(bool ishigh = false) const; uint ToUInt32(int offset = 0, bool isLittleEndian = true) const;
UInt64 ToUInt64() const; UInt64 ToUInt64(int offset = 0, bool isLittleEndian = true) const;
void Write(ushort value, int index = 0); void Write(ushort value, int index = 0);
void Write(short value, int index = 0); void Write(short value, int index = 0);
void Write(uint value, int index = 0); void Write(uint value, int index = 0);