[prettyprint] r585 committed - Minor renaming of methods.

[prett...@googlecode.com]

Revision: 585
Author: thockin
Date: Sun Jul 4 14:17:32 2010
Log: Minor renaming of methods.

http://code.google.com/p/prettyprint/source/detail?r=585

Modified:
/trunk/datatype_types.h
/trunk/devices/cpuid/generic_device.cpp
/trunk/drivers/cpu/cpu_driver.cpp
/trunk/drivers/cpuid/cpuid_binding.cpp
/trunk/drivers/cpuid/cpuid_driver.cpp
/trunk/drivers/io/io_binding.cpp
/trunk/drivers/io/io_driver.cpp
/trunk/drivers/mem/mem_binding.cpp
/trunk/drivers/mem/mem_driver.cpp
/trunk/drivers/msr/msr_binding.cpp
/trunk/drivers/msr/msr_driver.cpp
/trunk/drivers/pci/pci_binding.cpp
/trunk/drivers/pci/pci_driver.cpp
/trunk/language/syntax_tree.h
/trunk/util/bignum.h
/trunk/util/tests/bignum_test.cpp

=======================================
--- /trunk/datatype_types.h Wed Jun 2 22:43:40 2010
+++ /trunk/datatype_types.h Sun Jul 4 14:17:32 2010
@@ -456,7 +456,7 @@
virtual string
evaluate(const Value &value) const
{
- util::BitBuffer bits = value.get_bitbuffer();
+ util::BitBuffer bits = value.to_bitbuffer();
return string((char *)bits.get(), bits.size_bytes());
}

=======================================
--- /trunk/devices/cpuid/generic_device.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/devices/cpuid/generic_device.cpp Sun Jul 4 14:17:32 2010
@@ -199,7 +199,7 @@
FIELD("queries_needed", "int_t",
EAX("%function_2[-1]", 7, 0));
queries_needed =
- READ("queries_needed").get_uint();
+ READ("queries_needed").as_uint();
}

if (READ(EAX("%function_2[-1]", 31)) == Value(0)) {
=======================================
--- /trunk/drivers/cpu/cpu_driver.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/cpu/cpu_driver.cpp Sun Jul 4 14:17:32 2010
@@ -91,12 +91,12 @@

DiscoveryRequest dr;
dr.vendor = args[0] & MASK(12*8);
- dr.family_min = args[1].get_uint();
- dr.family_max = args[2].get_uint();
- dr.model_min = args[3].get_uint();
- dr.model_max = args[4].get_uint();
- dr.stepping_min = args[5].get_uint();
- dr.stepping_max = args[6].get_uint();
+ dr.family_min = args[1].as_uint();
+ dr.family_max = args[2].as_uint();
+ dr.model_min = args[3].as_uint();
+ dr.model_max = args[4].as_uint();
+ dr.stepping_min = args[5].as_uint();
+ dr.stepping_max = args[6].as_uint();
dr.function = function;
m_callbacks.push_back(dr);
}
=======================================
--- /trunk/drivers/cpuid/cpuid_binding.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/cpuid/cpuid_binding.cpp Sun Jul 4 14:17:32 2010
@@ -57,9 +57,9 @@

// call CPUID
uint32_t regs[4];
- unsigned int function = Value(address & MASK(32)).get_uint();
+ unsigned int function = Value(address & MASK(32)).as_uint();
unsigned int argument =
- Value((address >> 32) & MASK(32)).get_uint();
+ Value((address >> 32) & MASK(32)).as_uint();
asm volatile(
"cpuid"
: "=a" (regs[0]),
=======================================
--- /trunk/drivers/cpuid/cpuid_driver.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/cpuid/cpuid_driver.cpp Sun Jul 4 14:17:32 2010
@@ -41,7 +41,7 @@
throw Driver::ArgsError("cpuid<>: invalid cpu");
}

- return new_cpuid_binding(CpuidAddress(cpu.get_uint()));
+ return new_cpuid_binding(CpuidAddress(cpu.as_uint()));
}

} // namespace pp
=======================================
--- /trunk/drivers/io/io_binding.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/io/io_binding.cpp Sun Jul 4 14:17:32 2010
@@ -67,7 +67,7 @@
}

seek(address);
- util::BitBuffer bb = value.get_bitbuffer(width);
+ util::BitBuffer bb = value.to_bitbuffer(width);
if (m_file->write(bb.get(), bb.size_bytes()) != bb.size_bytes()) {
// We already did bounds checking, so this must be bad.
do_io_error(sprintfxx("error writing register 0x%x: %s",
@@ -117,7 +117,7 @@
void
IoIo::seek(const Value &offset) const
{
- m_file->seek(m_address.base+offset.get_uint(), SEEK_SET);
+ m_file->seek(m_address.base+offset.as_uint(), SEEK_SET);
}

} // namespace pp
=======================================
--- /trunk/drivers/io/io_driver.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/io/io_driver.cpp Sun Jul 4 14:17:32 2010
@@ -48,7 +48,7 @@
throw Driver::ArgsError("io<>: invalid size");
}

- return new_io_binding(IoAddress(base.get_uint(), size.get_uint()));
+ return new_io_binding(IoAddress(base.as_uint(), size.as_uint()));
}

} // namespace pp
=======================================
--- /trunk/drivers/mem/mem_binding.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/mem/mem_binding.cpp Sun Jul 4 14:17:32 2010
@@ -106,11 +106,11 @@
filesystem::FileMappingPtr
MemIo::map(const Value &offset, size_t length) const
{
- if (offset.get_uint()+length > m_address.size) {
+ if (offset.as_uint()+length > m_address.size) {
do_io_error(sprintfxx("can't access register 0x%x", offset));
}

- return m_file->mmap(m_address.base+offset.get_uint(), length);
+ return m_file->mmap(m_address.base+offset.as_uint(), length);
}

void
@@ -158,7 +158,7 @@

filesystem::FileMappingPtr mapping = map(offset, sizeof(Tdata));
Tdata *ptr = (Tdata *)mapping->address();
- Tdata data = value.get_uint();
+ Tdata data = value.as_uint();
*ptr = data;
}

=======================================
--- /trunk/drivers/mem/mem_driver.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/mem/mem_driver.cpp Sun Jul 4 14:17:32 2010
@@ -46,7 +46,7 @@
throw Driver::ArgsError("mem<>: invalid size");
}

- return new_mem_binding(MemAddress(base.get_uint(), size.get_uint()));
+ return new_mem_binding(MemAddress(base.as_uint(), size.as_uint()));
}

} // namespace pp
=======================================
--- /trunk/drivers/msr/msr_binding.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/msr/msr_binding.cpp Sun Jul 4 14:17:32 2010
@@ -70,7 +70,7 @@
}

seek(address);
- util::BitBuffer bb = value.get_bitbuffer(width);
+ util::BitBuffer bb = value.to_bitbuffer(width);
if (m_file->write(bb.get(), bb.size_bytes()) != bb.size_bytes()) {
// We already did bounds checking, so this must be bad.
do_io_error(sprintfxx("error writing register 0x%x: %s",
@@ -138,7 +138,7 @@
void
MsrIo::seek(const Value &offset) const
{
- m_file->seek(offset.get_uint(), SEEK_SET);
+ m_file->seek(offset.as_uint(), SEEK_SET);
}

} // namespace pp
=======================================
--- /trunk/drivers/msr/msr_driver.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/msr/msr_driver.cpp Sun Jul 4 14:17:32 2010
@@ -41,7 +41,7 @@
throw Driver::ArgsError("msr<>: invalid cpu");
}

- return new_msr_binding(MsrAddress(cpu.get_uint()));
+ return new_msr_binding(MsrAddress(cpu.as_uint()));
}

} // namespace pp
=======================================
--- /trunk/drivers/pci/pci_binding.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/pci/pci_binding.cpp Sun Jul 4 14:17:32 2010
@@ -81,7 +81,7 @@
}

seek(address);
- util::BitBuffer bb = value.get_bitbuffer(width);
+ util::BitBuffer bb = value.to_bitbuffer(width);
if (m_file->write(bb.get(), bb.size_bytes()) != bb.size_bytes()) {
// We already did bounds checking, but we might hit EOF on
// a 256 B PCI config space. That's still valid, since the
@@ -171,7 +171,7 @@
void
PciIo::seek(const Value &offset) const
{
- m_file->seek(offset.get_uint(), SEEK_SET);
+ m_file->seek(offset.as_uint(), SEEK_SET);
}

static void
=======================================
--- /trunk/drivers/pci/pci_driver.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/drivers/pci/pci_driver.cpp Sun Jul 4 14:17:32 2010
@@ -59,8 +59,8 @@
if (func < 0 || func >= 8) {
throw Driver::ArgsError("pci<>: invalid function");
}
- return new_pci_binding(PciAddress(seg.get_uint(), bus.get_uint(),
- dev.get_uint(), func.get_uint()));
+ return new_pci_binding(PciAddress(seg.as_uint(), bus.as_uint(),
+ dev.as_uint(), func.as_uint()));
}

void
@@ -114,8 +114,8 @@
}

DiscoveryRequest dr;
- dr.vendor = args[0].get_uint();
- dr.device = args[1].get_uint();
+ dr.vendor = args[0].as_uint();
+ dr.device = args[1].as_uint();
dr.function = function;
m_callbacks.push_back(dr);
}
@@ -124,8 +124,8 @@
PciDriver::find_discovery_request(const PciAddress &addr) const
{
PciIo dev(addr);
- uint16_t vid = dev.read(0, BITS16).get_uint();
- uint16_t did = dev.read(2, BITS16).get_uint();
+ uint16_t vid = dev.read(0, BITS16).as_uint();
+ uint16_t did = dev.read(2, BITS16).as_uint();

DTRACE(TRACE_DISCOVERY, sprintfxx("discovery: pci 0x%04x 0x%04x",
vid, did));
=======================================
--- /trunk/language/syntax_tree.h Sun Jul 4 10:58:50 2010
+++ /trunk/language/syntax_tree.h Sun Jul 4 14:17:32 2010
@@ -900,7 +900,7 @@
try {
Variable v(Type::INT);
m_index->evaluate(&v);
- size_t index = v.int_value().get_int();
+ size_t index = v.int_value().as_uint();
if (index >= expr_type.n_arguments()) {
string why = sprintfxx("type '%s' has no [%d] member",
expr_type.to_string(),
=======================================
--- /trunk/util/bignum.h Mon Jun 7 17:39:39 2010
+++ /trunk/util/bignum.h Sun Jul 4 14:17:32 2010
@@ -167,10 +167,10 @@
long long
get_si() const
{
- return get_int();
+ return as_int();
}
long long
- get_int() const
+ as_int() const
{
if (sizeof(long) == sizeof(long long)
|| (*this >= LONG_MIN && *this <= LONG_MAX)) {
@@ -199,10 +199,10 @@
unsigned long long
get_ui() const
{
- return get_int();
+ return as_uint();
}
unsigned long long
- get_uint() const
+ as_uint() const
{
if ((sizeof(long) == sizeof(long long))
|| (*this >= 0 && *this <= ULONG_MAX)) {
@@ -224,7 +224,7 @@
// Don't call this for negative numbers, which effectively have an
// infinite number of bits.
util::BitBuffer
- get_bitbuffer(std::size_t bits=0) const
+ to_bitbuffer(std::size_t bits=0) const
{
ASSERT(*this >= 0);

@@ -242,7 +242,7 @@

BigInt myval(*this);
for (std::size_t i = 0; i < bytes; i++) {
- bitbuf.byte_at(i) = myval.get_uint() & 0xff;
+ bitbuf.byte_at(i) = myval.as_uint() & 0xff;
myval >>= CHAR_BIT;
}

=======================================
--- /trunk/util/tests/bignum_test.cpp Wed Jun 2 22:43:40 2010
+++ /trunk/util/tests/bignum_test.cpp Sun Jul 4 14:17:32 2010
@@ -132,30 +132,30 @@
{
BigInt val(0x123456789abcdef0LL);
TEST_ASSERT(val.get_si() == 0x123456789abcdef0LL,
- "val.get_int()");
+ "val.get_si()");
TEST_ASSERT(val.get_ui() == 0x123456789abcdef0ULL,
- "val.get_uint()");
+ "val.get_ui()");
TEST_ASSERT(val.get_str(16) == "123456789abcdef0",
"BigInt::BigInt(signed long long)");
}
{
BigInt val(-1LL);
TEST_ASSERT(val.get_si() == -1,
- "val.get_int()");
+ "val.get_si()");
TEST_ASSERT(val.get_str(10) == "-1",
"BigInt::BigInt(signed long long)");
}
{
BigInt val(0x123456789abcdef0ULL);
TEST_ASSERT(val.get_ui() == 0x123456789abcdef0ULL,
- "val.get_uint()");
+ "val.get_ui()");
TEST_ASSERT(val.get_str(16) == "123456789abcdef0",
"BigInt::BigInt(unsigned long long)");
}
{
BigInt val(-1ULL);
- TEST_ASSERT(val.get_uint() == 0xffffffffffffffffULL,
- "val.get_uint()");
+ TEST_ASSERT(val.as_uint() == 0xffffffffffffffffULL,
+ "val.as_uint()");
TEST_ASSERT(val.get_str(16) == "ffffffffffffffff",
"BigInt::BigInt(unsigned long long)");
}
@@ -211,12 +211,12 @@
BigInt val(bb);
TEST_ASSERT(val.get_ui() == 0x12,
"BigInt(util::BitBuffer)");
- util::BitBuffer bb2 = val.get_bitbuffer();
+ util::BitBuffer bb2 = val.to_bitbuffer();
TEST_ASSERT(bb2.to_string() == "0x12",
- "BigInt::get_bitbuffer()");
- util::BitBuffer bb3 = val.get_bitbuffer(8);
+ "BigInt::to_bitbuffer()");
+ util::BitBuffer bb3 = val.to_bitbuffer(8);
TEST_ASSERT(bb3.to_string() == "0x12",
- "BigInt::get_bitbuffer(int)");
+ "BigInt::to_bitbuffer(int)");
}
{
util::BitBuffer bb(16);
@@ -225,12 +225,12 @@
BigInt val(bb);
TEST_ASSERT(val.get_ui() == 0x1234,
"BigInt(util::BitBuffer)");
- util::BitBuffer bb2 = val.get_bitbuffer();
+ util::BitBuffer bb2 = val.to_bitbuffer();
TEST_ASSERT(bb2.to_string() == "0x1234",
- "BigInt::get_bitbuffer()");
- util::BitBuffer bb3 = val.get_bitbuffer(16);
+ "BigInt::to_bitbuffer()");
+ util::BitBuffer bb3 = val.to_bitbuffer(16);
TEST_ASSERT(bb3.to_string() == "0x1234",
- "BigInt::get_bitbuffer(int)");
+ "BigInt::to_bitbuffer(int)");
}
}