fix endian issues with condition codes
use memcpy instead of bcopy
s/u_int32_t/uint32_t/g
fixup endian code to work with solaris
hack to make sure htole() works... Nate, have a good idea to fix this?
src/arch/sparc/faults.cc:
set the reset address to be 40 bits. Makes PC printing easier at least for now.
src/arch/sparc/isa/base.isa:
fix endian issues with condition codes
src/arch/sparc/tlb.hh:
add implemented physical addres constants
src/arch/sparc/utility.hh:
add tlb.hh to utilities
src/base/loader/raw_object.cc:
add a symbol <filename>_start to the symbol table for binaries files
src/base/remote_gdb.cc:
use memcpy instead of bcopy
src/cpu/exetrace.cc:
clean up printing a bit more
src/cpu/m5legion_interface.h:
add tons to the shared interface
src/dev/ethertap.cc:
s/u_int32_t/uint32_t/g
src/dev/ide_atareg.h:
fixup endian code to work with solaris
src/dev/pcidev.cc:
src/sim/param.hh:
hack to make sure htole() works...
--HG--
extra : convert_revision : 4579392184b40bcc1062671a953c6595c685e9b2
This commit is contained in:
@@ -178,7 +178,7 @@ EtherTap::recvPacket(EthPacketPtr packet)
|
||||
|
||||
DPRINTF(Ethernet, "EtherTap output len=%d\n", packet->length);
|
||||
DDUMP(EthernetData, packet->data, packet->length);
|
||||
u_int32_t len = htonl(packet->length);
|
||||
uint32_t len = htonl(packet->length);
|
||||
write(socket, &len, sizeof(len));
|
||||
write(socket, packet->data, packet->length);
|
||||
|
||||
@@ -199,11 +199,11 @@ EtherTap::process(int revent)
|
||||
return;
|
||||
}
|
||||
|
||||
char *data = buffer + sizeof(u_int32_t);
|
||||
char *data = buffer + sizeof(uint32_t);
|
||||
if (!(revent & POLLIN))
|
||||
return;
|
||||
|
||||
if (buffer_offset < data_len + sizeof(u_int32_t)) {
|
||||
if (buffer_offset < data_len + sizeof(uint32_t)) {
|
||||
int len = read(socket, buffer + buffer_offset, buflen - buffer_offset);
|
||||
if (len == 0) {
|
||||
detach();
|
||||
@@ -213,23 +213,23 @@ EtherTap::process(int revent)
|
||||
buffer_offset += len;
|
||||
|
||||
if (data_len == 0)
|
||||
data_len = ntohl(*(u_int32_t *)buffer);
|
||||
data_len = ntohl(*(uint32_t *)buffer);
|
||||
|
||||
DPRINTF(Ethernet, "Received data from peer: len=%d buffer_offset=%d "
|
||||
"data_len=%d\n", len, buffer_offset, data_len);
|
||||
}
|
||||
|
||||
while (data_len != 0 && buffer_offset >= data_len + sizeof(u_int32_t)) {
|
||||
while (data_len != 0 && buffer_offset >= data_len + sizeof(uint32_t)) {
|
||||
EthPacketPtr packet;
|
||||
packet = new EthPacketData(data_len);
|
||||
packet->length = data_len;
|
||||
memcpy(packet->data, data, data_len);
|
||||
|
||||
buffer_offset -= data_len + sizeof(u_int32_t);
|
||||
buffer_offset -= data_len + sizeof(uint32_t);
|
||||
assert(buffer_offset >= 0);
|
||||
if (buffer_offset > 0) {
|
||||
memmove(buffer, data + data_len, buffer_offset);
|
||||
data_len = ntohl(*(u_int32_t *)buffer);
|
||||
data_len = ntohl(*(uint32_t *)buffer);
|
||||
} else
|
||||
data_len = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user