From 2a1744f553442fbc3cd74114cbcd1305d91d8a90 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 9 Sep 2009 23:46:42 +0000 Subject: canonicalize namespace gymnastics git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81402 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/MemoryObject.cpp | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'lib/Support/MemoryObject.cpp') diff --git a/lib/Support/MemoryObject.cpp b/lib/Support/MemoryObject.cpp index 08e5fb75b3..91e3ecd23a 100644 --- a/lib/Support/MemoryObject.cpp +++ b/lib/Support/MemoryObject.cpp @@ -1,4 +1,4 @@ -//===- MemoryObject.cpp - Abstract memory interface -------------*- C++ -*-===// +//===- MemoryObject.cpp - Abstract memory interface -----------------------===// // // The LLVM Compiler Infrastructure // @@ -8,30 +8,27 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/MemoryObject.h" - -namespace llvm { +using namespace llvm; - MemoryObject::~MemoryObject() { - } +MemoryObject::~MemoryObject() { +} + +int MemoryObject::readBytes(uint64_t address, + uint64_t size, + uint8_t* buf, + uint64_t* copied) const { + uint64_t current = address; + uint64_t limit = getBase() + getExtent(); - int MemoryObject::readBytes(uint64_t address, - uint64_t size, - uint8_t* buf, - uint64_t* copied) const { - uint64_t current = address; - uint64_t limit = getBase() + getExtent(); - - while (current - address < size && current < limit) { - if (readByte(current, &buf[(current - address)])) - return -1; - - current++; - } + while (current - address < size && current < limit) { + if (readByte(current, &buf[(current - address)])) + return -1; - if (copied) - *copied = current - address; - - return 0; + current++; } - + + if (copied) + *copied = current - address; + + return 0; } -- cgit v1.2.3